From 7bb8486447d48ce906c7490660a14ac2519228f3 Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Thu, 25 Dec 2025 12:59:19 +0800 Subject: [PATCH] =?UTF-8?q?6.7.0=20-=20Alpha12=20-=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?ui.R=20=E5=B1=9E=E6=80=A7=20(getter)=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changelog/lang_zh-Hans.json | 1 + .../main/java/org/autojs/autojs/runtime/ScriptRuntime.kt | 8 ++++---- .../java/org/autojs/autojs/runtime/api/augment/ui/UI.kt | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index bb3e6046..6c5428bf 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -33,6 +33,7 @@ ], "fix": [ "notice 方法参数数量及类型限制错误 _[`issue #462`](http://issues.autojs6.com/462)_", + "ui.R 属性 (getter) 无法正常使用的问题", "isJavaClass/isJavaPackage 等全局方法无效的问题", "timers.keepAlive 方法 timeout 参数功能无效的问题", "floaty.window/rawWindow 方法无法接受字符串参数的问题 _[`issue #467`](http://issues.autojs6.com/467)_", diff --git a/app/src/main/java/org/autojs/autojs/runtime/ScriptRuntime.kt b/app/src/main/java/org/autojs/autojs/runtime/ScriptRuntime.kt index 2460ea5b..d323aba8 100644 --- a/app/src/main/java/org/autojs/autojs/runtime/ScriptRuntime.kt +++ b/app/src/main/java/org/autojs/autojs/runtime/ScriptRuntime.kt @@ -388,12 +388,12 @@ class ScriptRuntime private constructor(builder: Builder) { get() = bridges.isJavaPrimitiveWrap() set(b) = bridges.setJavaPrimitiveWrap(b) - private lateinit var augmentedApp: ScriptableObject - - private lateinit var augmentedAutojs: ScriptableObject - internal lateinit var consoleProxyObject: ProxyObject + internal lateinit var augmentedApp: ScriptableObject + + internal lateinit var augmentedAutojs: ScriptableObject + internal lateinit var augmentedOcrMLKit: ScriptableObject internal lateinit var augmentedOcrPaddle: ScriptableObject diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/augment/ui/UI.kt b/app/src/main/java/org/autojs/autojs/runtime/api/augment/ui/UI.kt index 5d3131c2..0096359a 100644 --- a/app/src/main/java/org/autojs/autojs/runtime/api/augment/ui/UI.kt +++ b/app/src/main/java/org/autojs/autojs/runtime/api/augment/ui/UI.kt @@ -80,7 +80,7 @@ class UI(private val scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRunt override val key = super.key.lowercase() - private val mProperties = ConcurrentHashMap() + private val mProperties = ConcurrentHashMap() private val mWidgetConstructor = object : BaseFunction() { @@ -124,7 +124,7 @@ class UI(private val scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRunt ) override val selfAssignmentGetters = listOf( - "R" to Supplier { scriptRuntime.topLevelScope.prop("R").jsUnwrapped() }, + "R" to Supplier { scriptRuntime.augmentedAutojs["R"] }, "__widgets__" to Supplier { scriptRuntime.ui.widgets }, "root" to Supplier { val activity = getActivity(scriptRuntime)