tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.4 - Alpha - 新增 util.dpToPx/spToPx/pxToDp/pxToSp 方法

Browse Source
This commit is contained in:
SuperMonster003
2025-05-29 16:48:36 +08:00
parent 86a52db513
commit 3f7cf5be0c
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/org/autojs/autojs/runtime/api/augment/util/Util.kt
View File

@@ -27,9 +27,12 @@ import org.autojs.autojs.runtime.api.augment.Augmentable
import org.autojs.autojs.runtime.api.augment.global.Species
import org.autojs.autojs.runtime.api.augment.util.Inspect.inspectRhino
import org.autojs.autojs.runtime.exception.WrappedIllegalArgumentException
import org.autojs.autojs.util.DisplayUtils
import org.autojs.autojs.util.RhinoUtils
import org.autojs.autojs.util.RhinoUtils.ObsoletedRhinoFunctionException
import org.autojs.autojs.util.RhinoUtils.callToStringFunction
import org.autojs.autojs.util.RhinoUtils.coerceFloatNumber
import org.autojs.autojs.util.RhinoUtils.coerceNumber
import org.autojs.autojs.util.RhinoUtils.js_function_bind
import org.autojs.autojs.util.RhinoUtils.js_json_stringify
import org.autojs.autojs.util.RhinoUtils.js_object_create
@@ -108,6 +111,10 @@ object Util : Augmentable() {
::toRegular.name,
::toRegularAndCall.name,
::toRegularAndApply.name,
::dpToPx.name,
::spToPx.name,
::pxToDp.name,
::pxToSp.name,
)
private val availableTypes = listOf(
@@ -568,9 +575,10 @@ object Util : Augmentable() {
fun ensureTypeRhino(o: Any?, type: Any?) {
if (type !is String) throw WrappedIllegalArgumentException("Argument \"type\" must be a string")
val niceType = type.lowercase()
if (niceType !in availableTypes) throw WrappedIllegalArgumentException("Argument \"type\" must be one of these types: ${
availableTypes.joinToString(", ") { "\"$it\"" }
}")
if (niceType !in availableTypes) throw WrappedIllegalArgumentException(
"Argument \"type\" must be one of these types: ${
availableTypes.joinToString(", ") { "\"$it\"" }
}")
if (js_typeof(o) != niceType) {
throw WrappedIllegalArgumentException("Argument must be type of $type instead of ${o.jsBrief()}")
}
@@ -736,6 +744,30 @@ object Util : Augmentable() {
throw ObsoletedRhinoFunctionException(::toRegularAndCall.name)
}
@JvmStatic
@RhinoSingletonFunctionInterface
fun dpToPx(args: Array<out Any?>): Double = ensureArgumentsOnlyOne(args) {
coerceNumber(DisplayUtils.dpToPx(coerceFloatNumber(it)))
}
@JvmStatic
@RhinoSingletonFunctionInterface
fun spToPx(args: Array<out Any?>): Double = ensureArgumentsOnlyOne(args) {
coerceNumber(DisplayUtils.spToPx(coerceFloatNumber(it)))
}
@JvmStatic
@RhinoSingletonFunctionInterface
fun pxToDp(args: Array<out Any?>): Double = ensureArgumentsOnlyOne(args) {
coerceNumber(DisplayUtils.pxToDp(coerceFloatNumber(it)))
}
@JvmStatic
@RhinoSingletonFunctionInterface
fun pxToSp(args: Array<out Any?>): Double = ensureArgumentsOnlyOne(args) {
coerceNumber(DisplayUtils.pxToSp(coerceFloatNumber(it)))
}
private fun getClassInternal(o: Any): Scriptable = when (o) {
is Class<*> -> o
else -> o.javaClass