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

6.6.1 - Alpha2 - 修复 UiObjectCollection 对象

Browse Source
This commit is contained in:
SuperMonster003
2024-12-09 20:34:13 +08:00
parent ea76e29322
commit c48cb3d589
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/autojs/autojs/rhino/AndroidContextFactory.kt
View File

@@ -75,7 +75,7 @@ open class AndroidContextFactory(private val cacheDirectory: File) : ContextFact
open class WrapFactory : org.mozilla.javascript.WrapFactory() { open class WrapFactory : org.mozilla.javascript.WrapFactory() {
override fun wrap(cx: Context, scope: Scriptable, obj: Any?, staticType: Class<*>?): Any? = when { override fun wrap(cx: Context, scope: Scriptable, obj: Any?, staticType: Class<*>?): Any? = when {
obj is String -> bridges.toString(obj.toString()) obj is String -> bridges.toString(obj.toString())
staticType == UiObjectCollection::class.java -> (obj as? UiObjectCollection)?.let { bridges.asArray(it.nodes) } ?: UiObjectCollection.EMPTY staticType == UiObjectCollection::class.java -> (obj as? UiObjectCollection)?.let { bridges.asArray(it) } ?: UiObjectCollection.EMPTY
else -> super.wrap(cx, scope, obj, staticType) else -> super.wrap(cx, scope, obj, staticType)
} }
} }

2
app/src/main/java/org/autojs/autojs/runtime/IScriptBridges.kt
View File

@@ -9,7 +9,7 @@ interface IScriptBridges {
fun toArray(o: Iterable<*>?): NativeArray fun toArray(o: Iterable<*>?): NativeArray
fun asArray(list: Iterable<*>): NativeArray fun asArray(listLike: Any): NativeArray
fun toString(obj: Any?): String fun toString(obj: Any?): String

26
app/src/main/java/org/autojs/autojs/runtime/ScriptBridges.kt
View File

@@ -1,7 +1,9 @@
package org.autojs.autojs.runtime package org.autojs.autojs.runtime
import org.autojs.autojs.core.automator.UiObjectCollection
import org.autojs.autojs.engine.RhinoJavaScriptEngine import org.autojs.autojs.engine.RhinoJavaScriptEngine
import org.autojs.autojs.util.RhinoUtils.callFunction import org.autojs.autojs.util.RhinoUtils.callFunction
import org.autojs.autojs.util.RhinoUtils.newNativeArray
import org.mozilla.javascript.BaseFunction import org.mozilla.javascript.BaseFunction
import org.mozilla.javascript.BoundFunction import org.mozilla.javascript.BoundFunction
import org.mozilla.javascript.Context import org.mozilla.javascript.Context
@@ -41,16 +43,22 @@ class ScriptBridges : IScriptBridges {
context.newArray(scope, o?.map { Context.javaToJS(it, scope) }?.toTypedArray()) as NativeArray context.newArray(scope, o?.map { Context.javaToJS(it, scope) }?.toTypedArray()) as NativeArray
} }
override fun asArray(list: Iterable<*>): NativeArray = useJsContext { context -> override fun asArray(listLike: Any): NativeArray = useJsContext { context ->
val arr = toArray(list) if (listLike is Iterable<*>) {
val boundThis = Context.javaToJS(list, arr) as Scriptable return@useJsContext toArray(listLike)
list::class.java.methods.forEach {
val name = it.name
val method = NativeJavaMethod(it, name)
val bound = BoundFunction(context, arr, method, boundThis, emptyArray())
arr.put(name, arr, bound)
} }
return@useJsContext arr if (listLike is UiObjectCollection) {
val arr = toArray(listLike.nodes)
val boundThis = Context.javaToJS(listLike, arr) as Scriptable
listLike::class.java.methods.forEach {
val name = it.name
val method = NativeJavaMethod(it, name)
val bound = BoundFunction(context, arr, method, boundThis, emptyArray())
arr.put(name, arr, bound)
}
return@useJsContext arr
}
return@useJsContext newNativeArray()
} }
override fun toString(obj: Any?): String = Context.toString(obj) override fun toString(obj: Any?): String = Context.toString(obj)