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

6.7.0 - Alpha12 - 修复 ui.R 属性 (getter) 无法正常使用的问题

Browse Source
This commit is contained in:
SuperMonster003
2025-12-25 12:59:19 +08:00
parent 160472a5a5
commit 7bb8486447
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.changelog/lang_zh-Hans.json
View File

@@ -33,6 +33,7 @@
], ],
"fix": [ "fix": [
"notice 方法参数数量及类型限制错误 _[`issue #462`](http://issues.autojs6.com/462)_", "notice 方法参数数量及类型限制错误 _[`issue #462`](http://issues.autojs6.com/462)_",
"ui.R 属性 (getter) 无法正常使用的问题",
"isJavaClass/isJavaPackage 等全局方法无效的问题", "isJavaClass/isJavaPackage 等全局方法无效的问题",
"timers.keepAlive 方法 timeout 参数功能无效的问题", "timers.keepAlive 方法 timeout 参数功能无效的问题",
"floaty.window/rawWindow 方法无法接受字符串参数的问题 _[`issue #467`](http://issues.autojs6.com/467)_", "floaty.window/rawWindow 方法无法接受字符串参数的问题 _[`issue #467`](http://issues.autojs6.com/467)_",

8
app/src/main/java/org/autojs/autojs/runtime/ScriptRuntime.kt
View File

@@ -388,12 +388,12 @@ class ScriptRuntime private constructor(builder: Builder) {
get() = bridges.isJavaPrimitiveWrap() get() = bridges.isJavaPrimitiveWrap()
set(b) = bridges.setJavaPrimitiveWrap(b) set(b) = bridges.setJavaPrimitiveWrap(b)
private lateinit var augmentedApp: ScriptableObject
private lateinit var augmentedAutojs: ScriptableObject
internal lateinit var consoleProxyObject: ProxyObject internal lateinit var consoleProxyObject: ProxyObject
internal lateinit var augmentedApp: ScriptableObject
internal lateinit var augmentedAutojs: ScriptableObject
internal lateinit var augmentedOcrMLKit: ScriptableObject internal lateinit var augmentedOcrMLKit: ScriptableObject
internal lateinit var augmentedOcrPaddle: ScriptableObject internal lateinit var augmentedOcrPaddle: ScriptableObject

4
app/src/main/java/org/autojs/autojs/runtime/api/augment/ui/UI.kt
View File

@@ -80,7 +80,7 @@ class UI(private val scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRunt
override val key = super.key.lowercase() override val key = super.key.lowercase()
private val mProperties = ConcurrentHashMap<String, Any?>() private val mProperties = ConcurrentHashMap<String, Any>()
private val mWidgetConstructor = object : BaseFunction() { private val mWidgetConstructor = object : BaseFunction() {
@@ -124,7 +124,7 @@ class UI(private val scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRunt
) )
override val selfAssignmentGetters = listOf( override val selfAssignmentGetters = listOf(
"R" to Supplier { scriptRuntime.topLevelScope.prop("R").jsUnwrapped() }, "R" to Supplier { scriptRuntime.augmentedAutojs["R"] },
"__widgets__" to Supplier { scriptRuntime.ui.widgets }, "__widgets__" to Supplier { scriptRuntime.ui.widgets },
"root" to Supplier<Any?> { "root" to Supplier<Any?> {
val activity = getActivity(scriptRuntime) val activity = getActivity(scriptRuntime)