diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java b/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java
index d63bc9454..3b66c2847 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java
@@ -16,8 +16,20 @@ public class ViewExtras {
 
     private static final String LOG_TAG = "ViewExtras";
     private NativeView mNativeView;
-
     private ViewAttributes mViewAttributes;
+    /** 创建该 view 的 ViewAttributes 时所用的解析器，按 view 固定下来。 */
+    private ResourceParser mResourceParser;
+    // 只保留弱引用：脚本退出后不应再由 ViewExtras 静态持有 ScriptRuntime 的资源。
+    private static volatile java.lang.ref.WeakReference<ResourceParser> sResourceParser;
+
+    public static void setResourceParser(ResourceParser parser) {
+        sResourceParser = new java.lang.ref.WeakReference<>(parser);
+    }
+
+    private static ResourceParser globalParser() {
+        java.lang.ref.WeakReference<ResourceParser> ref = sResourceParser;
+        return ref == null ? null : ref.get();
+    }
 
     public static ViewExtras get(View view) {
         ViewExtras extras;
@@ -32,6 +44,13 @@ public static ViewExtras get(View view) {
         return extras;
     }
 
+    public static ViewAttributes getViewAttributes(View view) {
+        ViewExtras extras = get(view);
+        // 后启动的脚本会覆盖静态 parser；优先用本 view 创建时绑定的那个，
+        // 否则旧脚本控件的属性解析会落到另一个脚本的运行时上。
+        ResourceParser parser = extras.mResourceParser;
+        return getViewAttributes(view, parser != null ? parser : globalParser());
+    }
 
     public static ViewAttributes getViewAttributes(View view, ResourceParser parser) {
         ViewExtras extras = get(view);
@@ -39,11 +58,11 @@ public static ViewAttributes getViewAttributes(View view, ResourceParser parser)
         if (attributes == null) {
             attributes = ViewAttributesFactory.create(parser, view);
             extras.setViewAttributes(attributes);
+            extras.mResourceParser = parser;
         }
         return attributes;
     }
 
-
     public static NativeView getNativeView(Scriptable scope, View view, Class<?> staticType, ScriptRuntime runtime) {
         ViewExtras extras = get(view);
         NativeView nativeView = extras.getNativeView();
@@ -59,6 +78,30 @@ public static NativeView getNativeView(View view) {
         return extras.getNativeView();
     }
 
+    public static void setAttr(View view, String name, Object value) {
+        ViewAttributes attrs = getViewAttributes(view);
+        attrs.setAttr(name, String.valueOf(value));
+    }
+
+    public static Object getAttr(View view, String name) {
+        ViewExtras extras = get(view);
+        ViewAttributes attrs = extras.getViewAttributes();
+        if (attrs != null) {
+            return attrs.getAttrValue(name);
+        }
+        return null;
+    }
+
+    public static NativeView getOrCreateNativeView(Scriptable scope, View view, ScriptRuntime runtime) {
+        ViewExtras extras = get(view);
+        NativeView nativeView = extras.getNativeView();
+        if (nativeView == null) {
+            nativeView = new NativeView(scope, view, view.getClass(), runtime);
+            extras.setNativeView(nativeView);
+        }
+        return nativeView;
+    }
+
     public final NativeView getNativeView() {
         return mNativeView;
     }
@@ -74,4 +117,4 @@ public final void setNativeView(NativeView nativeView) {
     public final void setViewAttributes(ViewAttributes viewAttributes) {
         mViewAttributes = viewAttributes;
     }
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java
index a35796684..589ce387c 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java
@@ -165,6 +165,10 @@ public void setAttrValue(String name, String value) {
         }
     }
 
+    public void setAttr(String name, Object value) {
+        setAttrValue(name, String.valueOf(value));
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     private void init() {
         onRegisterAttrs();
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/AttrSupport.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/AttrSupport.java
new file mode 100644
index 000000000..23bd592b9
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/AttrSupport.java
@@ -0,0 +1,60 @@
+package com.stardust.autojs.core.ui.widget;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.stardust.autojs.core.ui.ViewExtras;
+import com.stardust.autojs.core.ui.attribute.ViewAttributes;
+
+import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.Undefined;
+
+public interface AttrSupport {
+
+    default void attr(String name, Object value) {
+        ViewAttributes attrs = ViewExtras.getViewAttributes((View) this);
+        if (attrs != null) {
+            attrs.setAttr(name, ScriptRuntime.toString(value));
+        }
+    }
+
+    default Object attr(String name) {
+        ViewAttributes attrs = ViewExtras.getViewAttributes((View) this);
+        if (attrs != null) {
+            return attrs.getAttrValue(name);
+        }
+        return Undefined.SCRIPTABLE_UNDEFINED;
+    }
+
+    default void setWidth(int width) {
+        if (this instanceof View) {
+            View view = (View) this;
+            ViewGroup.LayoutParams params = view.getLayoutParams();
+            if (params != null) {
+                params.width = width;
+                view.setLayoutParams(params);
+                view.requestLayout();
+            }
+        }
+    }
+
+    default void setHeight(int height) {
+        if (this instanceof View) {
+            View view = (View) this;
+            ViewGroup.LayoutParams params = view.getLayoutParams();
+            if (params != null) {
+                params.height = height;
+                view.setLayoutParams(params);
+                view.requestLayout();
+            }
+        }
+    }
+
+    default int getWidth() {
+        return this instanceof View ? ((View) this).getWidth() : 0;
+    }
+
+    default int getHeight() {
+        return this instanceof View ? ((View) this).getHeight() : 0;
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java
index 126eec6d2..48d05ca81 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java
@@ -12,7 +12,7 @@
  */
 
 @SuppressLint("AppCompatCustomView")
-public class JsButton extends Button {
+public class JsButton extends Button implements AttrSupport {
     public JsButton(Context context) {
         super(context);
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java
index 9c0506599..d97da64c9 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java
@@ -12,7 +12,7 @@
  */
 
 @SuppressLint("AppCompatCustomView")
-public class JsEditText extends EditText {
+public class JsEditText extends EditText implements AttrSupport {
     public JsEditText(Context context) {
         super(context);
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java
index 3cad32dbc..129dcd8a0 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java
@@ -17,7 +17,7 @@
  * Created by Stardust on 2017/5/14.
  */
 
-public class JsFrameLayout extends FrameLayout {
+public class JsFrameLayout extends FrameLayout implements AttrSupport {
     public JsFrameLayout(@NonNull Context context) {
         super(context);
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java
index d4e5ebd46..e4fa0f014 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java
@@ -11,7 +11,7 @@
  * Created by Stardust on 2018/3/30.
  */
 
-public class JsGridView extends JsListView {
+public class JsGridView extends JsListView implements AttrSupport {
 
     public JsGridView(Context context, ScriptRuntime scriptRuntime) {
         super(context, scriptRuntime);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java
index 97b568606..73f55849a 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java
@@ -14,7 +14,7 @@
  * Created by Stardust on 2017/11/30.
  */
 
-public class JsImageView extends RoundedImageView {
+public class JsImageView extends RoundedImageView implements AttrSupport {
 
     private boolean mCircle;
     private Drawables mDrawables;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java
index 1ec5ec792..987e8d2cb 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java
@@ -14,7 +14,7 @@
  * Created by Stardust on 2017/5/14.
  */
 
-public class JsLinearLayout extends LinearLayout {
+public class JsLinearLayout extends LinearLayout implements AttrSupport {
 
 
     public JsLinearLayout(Context context) {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java
index 0e849373a..7b6c095c1 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java
@@ -21,7 +21,7 @@
  * Created by Stardust on 2018/3/28.
  */
 
-public class JsListView extends RecyclerView {
+public class JsListView extends RecyclerView implements AttrSupport {
 
     public interface DataSourceAdapter {
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java
index 703c3f6ce..f45aefd32 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java
@@ -13,7 +13,7 @@
  * Created by Stardust on 2017/5/14.
  */
 
-public class JsRelativeLayout extends RelativeLayout {
+public class JsRelativeLayout extends RelativeLayout implements AttrSupport {
     public JsRelativeLayout(Context context) {
         super(context);
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java
index ea77c62ae..d51c296f7 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java
@@ -8,10 +8,13 @@
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-public class JsSpinner extends androidx.appcompat.widget.AppCompatSpinner {
+import com.stardust.autojs.core.ui.ViewExtras;
+
+public class JsSpinner extends androidx.appcompat.widget.AppCompatSpinner implements AttrSupport {
 
     private float mTextSize = -1;
     private int mTextStyle = -1;
@@ -21,6 +24,13 @@ public class JsSpinner extends androidx.appcompat.widget.AppCompatSpinner {
     private int mEntryTextStyle = -1;
     private int mEntryTextColor = 0;
 
+    private int mEntryHeight = -1;
+
+    private int mDropdownTextColorNormal;
+    private int mDropdownTextColorSelected;
+    private int mDropdownBgColorNormal;
+    private int mDropdownBgColorSelected;
+
     public JsSpinner(Context context) {
         super(context);
     }
@@ -45,7 +55,6 @@ public JsSpinner(Context context, AttributeSet attrs, int defStyleAttr, int mode
         super(context, attrs, defStyleAttr, mode, popupTheme);
     }
 
-
     public float getTextSize() {
         return mTextSize;
     }
@@ -84,7 +93,6 @@ public void setTextSize(float textSize) {
         }
     }
 
-
     public int getTextStyle() {
         return mTextStyle;
     }
@@ -113,6 +121,59 @@ public void setTextColor(int textColor) {
         }
     }
 
+    public void setDropDownMaxHeight(int maxHeightPx) {
+        try {
+            java.lang.reflect.Method method = androidx.appcompat.widget.AppCompatSpinner.class
+                    .getDeclaredMethod("getInternalPopup");
+            method.setAccessible(true);
+            Object popup = method.invoke(this);
+            if (popup != null) {
+                java.lang.reflect.Method setHeight = popup.getClass()
+                        .getMethod("setHeight", int.class);
+                setHeight.invoke(popup, maxHeightPx);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setDropDownItemHeight(int heightPx) {
+        mEntryHeight = heightPx;
+    }
+
+    public void setDropdownTextColors(int normalColor, int selectedColor) {
+        mDropdownTextColorNormal = normalColor;
+        mDropdownTextColorSelected = selectedColor;
+    }
+
+    public void setDropdownBackgroundColors(int normalColor, int selectedColor) {
+        mDropdownBgColorNormal = normalColor;
+        mDropdownBgColorSelected = selectedColor;
+    }
+
+    public void setDropdownItems(String[] items) {
+        int defaultHeight = (int) (48 * getContext().getResources().getDisplayMetrics().density);
+        setDropdownItems(items, defaultHeight, null, null);
+    }
+
+    public void setDropdownItems(String[] items, Integer itemHeight) {
+        setDropdownItems(items, itemHeight, null, null);
+    }
+
+    public void setDropdownItems(String[] items, Integer itemHeight, Integer itemLayout, Integer dropDownLayout) {
+        if (items == null || items.length == 0) return;
+
+        if (itemHeight != null) {
+            mEntryHeight = itemHeight;
+        }
+
+        int layoutRes = itemLayout != null ? itemLayout : android.R.layout.simple_spinner_item;
+        int dropDownRes = dropDownLayout != null ? dropDownLayout : android.R.layout.simple_spinner_dropdown_item;
+
+        Adapter adapter = new Adapter(getContext(), layoutRes, items);
+        adapter.setDropDownViewResource(dropDownRes);
+        setAdapter(adapter);
+    }
 
     public class Adapter extends ArrayAdapter<String> {
 
@@ -147,6 +208,7 @@ public View getDropDownView(int position, @Nullable View convertView, @NonNull V
                 return view;
             }
             TextView textView = (TextView) view;
+
             if (mEntryTextColor != 0) {
                 textView.setTextColor(mEntryTextColor);
             }
@@ -156,7 +218,32 @@ public View getDropDownView(int position, @Nullable View convertView, @NonNull V
             if (mEntryTextStyle != -1) {
                 textView.setTypeface(textView.getTypeface(), mEntryTextStyle);
             }
+
+            if (position == getSelectedItemPosition()) {
+                if (mDropdownTextColorSelected != 0) {
+                    textView.setTextColor(mDropdownTextColorSelected);
+                }
+                if (mDropdownBgColorSelected != 0) {
+                    textView.setBackgroundColor(mDropdownBgColorSelected);
+                }
+            } else {
+                if (mDropdownTextColorNormal != 0) {
+                    textView.setTextColor(mDropdownTextColorNormal);
+                }
+                if (mDropdownBgColorNormal != 0) {
+                    textView.setBackgroundColor(mDropdownBgColorNormal);
+                }
+            }
+
+            if (mEntryHeight > 0) {
+                AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
+                        AbsListView.LayoutParams.MATCH_PARENT,
+                        mEntryHeight
+                );
+                textView.setLayoutParams(lp);
+            }
+
             return textView;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java
index 88f7aef38..cfd96e971 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java
@@ -5,7 +5,7 @@
 
 import com.google.android.material.tabs.TabLayout;
 
-public class JsTabLayout extends TabLayout {
+public class JsTabLayout extends TabLayout implements AttrSupport {
 
     public JsTabLayout(Context context) {
         super(context);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java
index e91153db6..2d2431ba3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java
@@ -12,7 +12,7 @@
  */
 
 @SuppressLint("AppCompatCustomView")
-public class JsTextView extends TextView {
+public class JsTextView extends TextView implements AttrSupport {
 
     public JsTextView(Context context) {
         super(context);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java
index 95304c6e4..5bd900123 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java
@@ -12,7 +12,7 @@
 
 import com.stardust.autojs.R;
 
-public class JsToolbar extends Toolbar {
+public class JsToolbar extends Toolbar implements AttrSupport {
 
     public JsToolbar(Context context) {
         super(context);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.kt b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.kt
index fa310a43b..4d171dd27 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.kt
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.kt
@@ -5,9 +5,12 @@ import android.content.Context
 import android.util.AttributeSet
 import android.webkit.WebView
 import androidx.webkit.WebViewAssetLoader
+import com.stardust.autojs.core.ui.ViewExtras
 import com.stardust.autojs.core.web.JsBridge
+import org.mozilla.javascript.ScriptRuntime
 import java.io.File
 
+
 @SuppressLint("SetJavaScriptEnabled")
 open class JsWebView : WebView {
     //val events = EventEmitter()
@@ -55,4 +58,20 @@ open class JsWebView : WebView {
     fun injectionJsBridge() {
         JsBridge.injectionJsBridge(this)
     }
+
+    fun attr(name: String?, value: Any?) {
+        val attrs = ViewExtras.getViewAttributes(this)
+        if (attrs != null) {
+            attrs.setAttr(name, ScriptRuntime.toString(value))
+        }
+    }
+
+    fun attr(name: String?): Any? {
+        val attrs = ViewExtras.getViewAttributes(this)
+        if (attrs != null) {
+            return attrs.getAttrValue(name)
+        }
+        return null
+    }
+
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
index a91da9942..3c6ea886c 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
@@ -21,12 +21,10 @@ import org.mozilla.javascript.Script
 import org.mozilla.javascript.Scriptable
 import org.mozilla.javascript.ScriptableObject
 import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider
+import org.mozilla.javascript.lc.type.TypeInfo
 import java.io.IOException
 import java.io.InputStreamReader
-
-/**
- * Created by Stardust on 2017/4/2.
- */
+import java.net.URI
 
 open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Context) :
     JavaScriptEngine() {
@@ -34,14 +32,14 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
     private val wrapFactory = WrapFactory()
     val context: Context = enterContext()
     private val mScriptable: TopLevelScope = createScope(this.context)
-    lateinit var thread: Thread
+    var thread: Thread? = null
         private set
 
     private val initScript: Script by lazy<Script> {
         try {
             val reader = InputStreamReader(mAndroidContext.assets.open("init.js"))
             val script = context.compileReader(reader, SOURCE_NAME_INIT, 1, null)
-            script
+            script!!
         } catch (e: IOException) {
             throw UncheckedIOException(e)
         }
@@ -51,10 +49,6 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
     val scriptable: Scriptable
         get() = mScriptable
 
-    init {
-
-    }
-
     override fun put(name: String, value: Any?) {
         ScriptableObject.putProperty(mScriptable, name, Context.javaToJS(value, mScriptable))
     }
@@ -84,7 +78,6 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
         } catch (e: IOException) {
             throw UncheckedIOException(e)
         }
-
     }
 
     fun hasFeature(feature: String): Boolean {
@@ -92,24 +85,24 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
         return config != null && config.scriptConfig.hasFeature(feature)
     }
 
-
     override fun forceStop() {
         Log.d(LOG_TAG, "forceStop: interrupt Thread: $thread")
-        thread.interrupt()
+        thread?.interrupt()
     }
 
-
     @Synchronized
     override fun destroy() {
         super.destroy()
-        // 清除 require 缓存，释放所有 ModuleScope
         if (::require.isInitialized) {
             require.clearCache()
-            ObjectWatcher.watch(require, "$this::$require")
+            ObjectWatcher.watch(require, "$this::${require}")
         }
-        // 退出当前线程的 Rhino Context
-        Context.exit()
-        ObjectWatcher.watch(this, this.toString())
+        try {
+            Context.exit()
+        } catch (e: IllegalStateException) {
+            Log.w(LOG_TAG, "Context.exit() on wrong thread", e)
+        }
+        ObjectWatcher.watch(this, toString())
     }
 
     override fun init() {
@@ -161,29 +154,29 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
         }
     }
 
-
     private inner class WrapFactory : AndroidContextFactory.WrapFactory() {
+        /**
+         * Rhino 1.9.2 的 wrap(..., TypeInfo) 最终会调用本方法，因此只在这里把 View
+         * 交给 NativeView（NativeJavaObjectWithPrototype 的 prototype 链）即可：
+         * UI 属性方法由 Rhino 自己按 Java 成员 + prototype 分派，无需手写反射。
+         * wrap(..., TypeInfo) 保持在父类中重写，避免绕过 UiObject 的特殊包装。
+         */
         override fun wrapAsJavaObject(
             cx: Context?,
             scope: Scriptable?,
-            javaObject: Any?,
-            staticType: Class<*>?
+            obj: Any?,
+            staticType: TypeInfo?
         ): Scriptable? {
-            //Log.d(LOG_TAG, "wrapAsJavaObject: java = " + javaObject + ", result = " + result + ", scope = " + scope);
-            return if (javaObject is View) {
-                ViewExtras.getNativeView(scope, javaObject, staticType, runtime)
-            } else {
-                super.wrapAsJavaObject(cx, scope, javaObject, staticType)
+            if (obj is View && scope != null) {
+                val staticClass = staticType?.asClass() ?: obj.javaClass
+                return ViewExtras.getNativeView(scope, obj, staticClass, runtime)
             }
+            return super.wrapAsJavaObject(cx, scope, obj, staticType)
         }
-
     }
 
     companion object {
         const val SOURCE_NAME_INIT = "<init>"
         private const val LOG_TAG = "RhinoJavaScriptEngine"
-
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt
index acfd0317a..b348e31c4 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt
@@ -10,6 +10,7 @@ import com.stardust.automator.UiObjectCollection
 import org.mozilla.javascript.Context
 import org.mozilla.javascript.ContextFactory
 import org.mozilla.javascript.Scriptable
+import org.mozilla.javascript.lc.type.TypeInfo
 import java.io.File
 import java.util.Locale
 import java.util.concurrent.atomic.AtomicInteger
@@ -92,7 +93,12 @@ open class AndroidContextFactory(private val cacheDirectory: File) : ContextFact
             isJavaPrimitiveWrap = false
         }
 
-        override fun wrap(cx: Context, scope: Scriptable, obj: Any?, staticType: Class<*>?): Any? {
+        /**
+         * Rhino 1.9.2 内部统一走 wrap(..., TypeInfo)，旧的 wrap(..., Class) 重载只做
+         * 一次 TypeInfo 转换后回调本方法。若仍重写旧签名，UiObject / UiObjectCollection
+         * 的特殊包装会完全失效，因此迁移到 TypeInfo 签名。
+         */
+        override fun wrap(cx: Context?, scope: Scriptable?, obj: Any?, staticType: TypeInfo?): Any? {
             return when (obj) {
                 is UiObject -> if (Build.VERSION.SDK_INT >= 30) {
                     super.wrap(cx, scope, obj, staticType)
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/BindingNativeJavaObject.java b/autojs/src/main/java/com/stardust/autojs/rhino/BindingNativeJavaObject.java
index 82fcb5417..99d7d2d7e 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/BindingNativeJavaObject.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/BindingNativeJavaObject.java
@@ -2,6 +2,7 @@
 
 import org.mozilla.javascript.NativeJavaObject;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.lc.type.TypeInfo;
 
 public class BindingNativeJavaObject extends NativeJavaObject {
 
@@ -9,22 +10,23 @@ public BindingNativeJavaObject() {
     }
 
     public BindingNativeJavaObject(Scriptable scope, Object javaObject, Class<?> staticType) {
+        super(scope, javaObject, new SimpleTypeInfo(staticType));
+    }
+
+    public BindingNativeJavaObject(Scriptable scope, Object javaObject, TypeInfo staticType) {
         super(scope, javaObject, staticType);
     }
 
-    public BindingNativeJavaObject(Scriptable scope, Object javaObject, Class<?> staticType, boolean isAdapter) {
+    public BindingNativeJavaObject(Scriptable scope, Object javaObject, TypeInfo staticType, boolean isAdapter) {
         super(scope, javaObject, staticType, isAdapter);
     }
 
     @Override
     protected void initMembers() {
-        Class dynamicType;
         if (this.javaObject != null) {
-            dynamicType = this.javaObject.getClass();
-        } else {
-            dynamicType = this.staticType;
+            this.javaObject.getClass();
+        } else if (this.staticType != null) {
+            this.staticType.asClass();
         }
-
-
     }
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/NativeJavaObjectWithPrototype.java b/autojs/src/main/java/com/stardust/autojs/rhino/NativeJavaObjectWithPrototype.java
index 3de1ffc30..1b6667023 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/NativeJavaObjectWithPrototype.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/NativeJavaObjectWithPrototype.java
@@ -1,20 +1,31 @@
 package com.stardust.autojs.rhino;
 
+import android.widget.TextView;
+
 import org.mozilla.javascript.NativeJavaObject;
+import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.lc.type.TypeInfo;
 
 /**
  * Created by Stardust on 2018/4/4.
  */
-
 public class NativeJavaObjectWithPrototype extends NativeJavaObject {
 
-
     public NativeJavaObjectWithPrototype(Scriptable scope, Object javaObject, Class<?> staticType) {
-        super(scope, javaObject, staticType);
+        super(scope, javaObject, new SimpleTypeInfo(staticType));
     }
 
     public NativeJavaObjectWithPrototype(Scriptable scope, Object javaObject, Class<?> staticType, boolean isAdapter) {
+        super(scope, javaObject, new SimpleTypeInfo(staticType), isAdapter);
+    }
+
+    public NativeJavaObjectWithPrototype(Scriptable scope, Object javaObject, TypeInfo staticType) {
+        super(scope, javaObject, staticType);
+    }
+
+    public NativeJavaObjectWithPrototype(Scriptable scope, Object javaObject, TypeInfo staticType, boolean isAdapter) {
         super(scope, javaObject, staticType, isAdapter);
     }
 
@@ -24,15 +35,15 @@ public NativeJavaObjectWithPrototype() {
     @Override
     public boolean has(String name, Scriptable start) {
         return super.has(name, start) || (prototype != null && prototype.has(name, start))
-                || name.equals("__proto__");
+                || name.equals(NativeObject.PROTO_PROPERTY);
     }
 
     @Override
     public Object get(String name, Scriptable start) {
-        if (name.equals("__proto__")) {
+        if (name.equals(NativeObject.PROTO_PROPERTY)) {
             return prototype;
         }
-        if(super.has(name, start)){
+        if (super.has(name, start)) {
             return super.get(name, start);
         }
         if (prototype == null) {
@@ -43,10 +54,18 @@ public Object get(String name, Scriptable start) {
 
     @Override
     public void put(String name, Scriptable start, Object value) {
-        if (name.equals("__proto__")) {
+        if (name.equals(NativeObject.PROTO_PROPERTY)) {
             prototype = (Scriptable) value;
             return;
         }
+        // JsTextView / JsButton / JsEditText 同时提供 text() 与 text(CharSequence)，
+        // Rhino 会把 text 暴露成 NativeJavaMethod。此时 super.put() 只会把值写进
+        // JS 属性表，被同名 Java 方法遮蔽，view.text = "..." 看起来毫无效果。
+        // 这里把 text 赋值直接落到 TextView.setText，属性语法与方法调用即可共存。
+        if ("text".equals(name) && unwrap() instanceof TextView) {
+            ((TextView) unwrap()).setText(ScriptRuntime.toString(value));
+            return;
+        }
         super.put(name, start, value);
     }
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/ProxyJavaObject.java b/autojs/src/main/java/com/stardust/autojs/rhino/ProxyJavaObject.java
index cb9bf9e32..6fa29efe6 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/ProxyJavaObject.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/ProxyJavaObject.java
@@ -1,43 +1,49 @@
 package com.stardust.autojs.rhino;
 
+import android.util.Log;
+
 import org.mozilla.javascript.Context;
-import org.mozilla.javascript.NativeFunction;
+import org.mozilla.javascript.Function;
 import org.mozilla.javascript.NativeJavaObject;
 import org.mozilla.javascript.NativeObject;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.UniqueTag;
-
-/**
- * Created by Stardust on 2017/12/6.
- */
+import org.mozilla.javascript.lc.type.TypeInfo;
 
 public class ProxyJavaObject extends NativeJavaObject {
-
-    private NativeFunction mGetter;
-    private NativeFunction mSetter;
+    private static final String TAG = "ProxyJavaObject";
+    private Function mGetter;
+    private Function mSetter;
 
     public ProxyJavaObject() {
+        super();
+    }
+
+    public ProxyJavaObject(Scriptable scope, Object javaObject) {
+        super(scope, javaObject, new SimpleTypeInfo(javaObject != null ? javaObject.getClass() : Object.class));
     }
 
     public ProxyJavaObject(Scriptable scope, Object javaObject, Class<?> staticType) {
-        super(scope, javaObject, staticType);
+        super(scope, javaObject, new SimpleTypeInfo(staticType != null ? staticType : Object.class));
     }
 
-    public ProxyJavaObject(Scriptable scope, Object javaObject, Class<?> staticType, boolean isAdapter) {
-        super(scope, javaObject, staticType, isAdapter);
+    public ProxyJavaObject(Scriptable scope, Object javaObject, TypeInfo staticType) {
+        super(scope, javaObject, staticType);
     }
 
     @Override
     public void put(String name, Scriptable start, Object value) {
-        if (name.equals("__proxy__")) {
+        if (name.equals("__proxy__") && value instanceof NativeObject) {
             NativeObject proxy = (NativeObject) value;
             Object getter = proxy.get("get", start);
-            if (getter instanceof NativeFunction) {
-                mGetter = (NativeFunction) getter;
+            if (getter instanceof Function) {
+                mGetter = (Function) getter;
+                Log.d(TAG, "__proxy__ getter set");
             }
             Object setter = proxy.get("set", start);
-            if (setter instanceof NativeFunction) {
-                mSetter = (NativeFunction) setter;
+            if (setter instanceof Function) {
+                mSetter = (Function) setter;
+                Log.d(TAG, "__proxy__ setter set");
             }
         } else if (mSetter != null) {
             mSetter.call(Context.getCurrentContext(), start, start, new Object[]{name, value});
@@ -57,7 +63,7 @@ public Object get(String name, Scriptable start) {
             return value;
         }
         if (mGetter != null) {
-            value = mGetter.call(Context.getCurrentContext(), start, start, new Object[]{name});
+            return mGetter.call(Context.getCurrentContext(), start, start, new Object[]{name});
         }
         return value;
     }
@@ -66,5 +72,4 @@ public Object get(String name, Scriptable start) {
     public Object getDefaultValue(Class<?> typeHint) {
         return toString();
     }
-}
-
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/ProxyObject.java b/autojs/src/main/java/com/stardust/autojs/rhino/ProxyObject.java
index 8fd84f56b..c16990937 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/ProxyObject.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/ProxyObject.java
@@ -1,36 +1,46 @@
 package com.stardust.autojs.rhino;
 
+import android.util.Log;
+
 import org.mozilla.javascript.Context;
-import org.mozilla.javascript.NativeFunction;
-import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.UniqueTag;
 
-/**
- * Created by Stardust on 2017/5/17.
- */
+public class ProxyObject extends ScriptableObject {
 
-public class ProxyObject extends NativeObject {
+    private Function mGetter;
+    private Function mSetter;
 
-    private NativeFunction mGetter;
-    private NativeFunction mSetter;
+    @Override
+    public String getClassName() {
+        return "ProxyObject";
+    }
 
     @Override
     public void put(String name, Scriptable start, Object value) {
-        if (name.equals("__proxy__")) {
-            NativeObject proxy = (NativeObject) value;
-            Object getter = proxy.get("get", start);
-            if (getter instanceof NativeFunction) {
-                mGetter = (NativeFunction) getter;
-            }
-            Object setter = proxy.get("set", start);
-            if (setter instanceof NativeFunction) {
-                mSetter = (NativeFunction) setter;
+        // 只记属性名：value 可能是插件配置里的 token 等敏感值。
+        Log.d("ProxyObject", "put(" + name + ")");
+        if (!name.equals("__proxy__") || !(value instanceof Scriptable)) {
+            if (mSetter != null) {
+                mSetter.call(Context.getCurrentContext(), start, start, new Object[]{name, value});
+                return;
+            } else {
+                super.put(name, start, value);
+                return;
             }
-        } else if (mSetter != null) {
-            mSetter.call(Context.getCurrentContext(), start, start, new Object[]{name, value});
-        } else {
-            super.put(name, start, value);
+        }
+        Scriptable proxy = (Scriptable) value;
+        Object getter = proxy.get("get", start);
+        if (getter instanceof Function) {
+            mGetter = (Function) getter;
+            Log.d("ProxyObject", "__proxy__ set, mGetter=" + mGetter);
+        }
+        Object setter = proxy.get("set", start);
+        if (setter instanceof Function) {
+            mSetter = (Function) setter;
+            Log.d("ProxyObject", "__proxy__ set, mSetter=" + mSetter);
         }
     }
 
@@ -40,12 +50,12 @@ public Object getWithoutProxy(String name, Scriptable start) {
 
     @Override
     public Object get(String name, Scriptable start) {
-        Object value = super.get(name, start);
-        if (value != null && value != UniqueTag.NOT_FOUND) {
-            return value;
+        if ("bindingContext".equals(name) || "__noSuchMethod__".equals(name)) {
+            return super.get(name, start);
         }
-        if (mGetter != null) {
-            value = mGetter.call(Context.getCurrentContext(), start, start, new Object[]{name});
+        Object value = super.get(name, start);
+        if ((value == null || value == UniqueTag.NOT_FOUND) && mGetter != null) {
+            return mGetter.call(Context.getCurrentContext(), start, start, new Object[]{name});
         }
         return value;
     }
@@ -54,4 +64,4 @@ public Object get(String name, Scriptable start) {
     public Object getDefaultValue(Class<?> typeHint) {
         return toString();
     }
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/SimpleTypeInfo.java b/autojs/src/main/java/com/stardust/autojs/rhino/SimpleTypeInfo.java
new file mode 100644
index 000000000..7be865963
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/SimpleTypeInfo.java
@@ -0,0 +1,30 @@
+package com.stardust.autojs.rhino;
+
+import androidx.annotation.NonNull;
+
+import org.mozilla.javascript.lc.type.TypeFormatContext;
+import org.mozilla.javascript.lc.type.TypeInfo;
+
+public class SimpleTypeInfo implements TypeInfo {
+    private final Class<?> clazz;
+
+    public SimpleTypeInfo(Class<?> clazz) {
+        this.clazz = clazz != null ? clazz : Object.class;
+    }
+
+    @Override
+    public Class<?> asClass() {
+        return this.clazz;
+    }
+
+    @Override
+    public String toString(TypeFormatContext context) {
+        return this.clazz.getName();
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return this.clazz.getName();
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.kt b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.kt
index e62fdff75..2460753f1 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.kt
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.kt
@@ -2,6 +2,7 @@ package com.stardust.autojs.runtime
 
 import android.os.Looper
 import com.stardust.autojs.engine.RhinoJavaScriptEngine
+import com.stardust.autojs.rhino.SimpleTypeInfo
 import com.stardust.automator.UiObjectCollection
 import org.mozilla.javascript.BaseFunction
 import org.mozilla.javascript.BoundFunction
@@ -9,54 +10,54 @@ import org.mozilla.javascript.Context
 import org.mozilla.javascript.NativeJavaMethod
 import org.mozilla.javascript.NativeJavaObject
 import org.mozilla.javascript.Scriptable
+import org.mozilla.javascript.ScriptableObject
 import org.mozilla.javascript.Undefined
 import org.mozilla.javascript.annotations.JSFunction
+import java.lang.reflect.Method
 
-/**
- * Created by Stardust on 2017/7/21.
- */
 class ScriptBridges {
     var engine: RhinoJavaScriptEngine? = null
+
     fun setup(engine: RhinoJavaScriptEngine) {
         this.engine = engine
     }
 
     private fun <T> useJsContext(f: (context: Context) -> T): T {
         val context = Context.getCurrentContext()
-        val cx: Context = context ?: with(Context.enter()) {
-            engine?.setupContext(this)
-            this
+        val cx: Context = context ?: Context.enter().also {
+            engine?.setupContext(it)
         }
         try {
             return f(cx)
         } finally {
-            context ?: Context.exit()
+            if (context == null) {
+                Context.exit()
+            }
         }
     }
 
-    fun callFunction(func: Any?, target: Any?, args: Array<*>) = useJsContext<Any?> { context ->
+    fun callFunction(func: Any?, target: Any?, args: Array<*>): Any? = useJsContext { context ->
         val jsFn = func as BaseFunction
         val scope = jsFn.parentScope
         val arg = args.map { Context.javaToJS(it, scope) }.toTypedArray()
-        return@useJsContext try {
-            jsFn.call(
-                context, scope,
-                (Context.javaToJS(target, scope) as? Scriptable) ?: Undefined.SCRIPTABLE_UNDEFINED,
-                arg
-            )
+        try {
+            val targetObj = Context.javaToJS(target, scope)
+            val thisObj = targetObj as? Scriptable ?: Undefined.SCRIPTABLE_UNDEFINED
+            jsFn.call(context, scope, thisObj, arg)
         } catch (e: Exception) {
             if (Looper.getMainLooper() == Looper.myLooper()) {
                 engine?.runtime?.exit(e) ?: throw e
-            } else throw e
+            } else {
+                throw e
+            }
         }
     }
 
     @JSFunction
-    fun toArray(c: Iterable<*>): Scriptable = useJsContext<Scriptable> { context ->
+    fun toArray(c: Iterable<*>): Scriptable = useJsContext { context ->
         val scope = context.initStandardObjects()
-        return@useJsContext context.newArray(
-            scope, c.map { Context.javaToJS(it, scope) }.toTypedArray()
-        )
+        val array = c.map { Context.javaToJS(it, scope) }.toTypedArray()
+        context.newArray(scope, array)
     }
 
     fun toString(obj: Any?): String {
@@ -65,13 +66,13 @@ class ScriptBridges {
 
     fun asArray(obj: UiObjectCollection): Scriptable = useJsContext { context ->
         val arr = toArray(obj.mNodes)
-        val thzs = NativeJavaObject(arr, obj, obj.javaClass)
-        obj::class.java.methods.forEach {
-            val name = it.name
-            val method = NativeJavaMethod(it, name)
-            val bound = BoundFunction(context, arr, method, thzs, emptyArray())
+        val thzs = NativeJavaObject(arr, obj, SimpleTypeInfo(obj.javaClass))
+        obj.javaClass.methods.forEach { method ->
+            val name = method.name
+            val nativeMethod = NativeJavaMethod(method, name)
+            val bound = BoundFunction(context, arr, nativeMethod, thzs, emptyArray())
             arr.put(name, arr, bound)
         }
-        return@useJsContext arr
+        arr
     }
 }
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
index 1f5b7b950..7854a9bb7 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
@@ -14,6 +14,7 @@
 import com.stardust.autojs.core.image.Colors;
 import com.stardust.autojs.core.looper.Loopers;
 import com.stardust.autojs.core.permission.Permissions;
+import com.stardust.autojs.core.ui.ViewExtras;
 import com.stardust.autojs.rhino.TopLevelScope;
 import com.stardust.autojs.runtime.api.AppUtils;
 import com.stardust.autojs.runtime.api.Console;
@@ -37,8 +38,6 @@
 import com.stardust.util.SdkVersionUtil;
 import com.stardust.util.UiHandler;
 
-import org.mozilla.javascript.Scriptable;
-
 import java.lang.ref.WeakReference;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -125,6 +124,7 @@ protected ScriptRuntime(ScriptRuntimeV2.Builder builder) {
         console = builder.getConsole();
         accessibilityBridge = builder.getAccessibilityBridge();
         ui = new UI(context, this);
+        ViewExtras.setResourceParser(ui.getResourceParser());
         this.info = accessibilityBridge.getInfoProvider();
         images = new Images(context, this, builder.getScreenCaptureRequester());
         engines = new Engines(builder.getEngineService(), this);
@@ -278,4 +278,4 @@ public Object removeProperty(String key) {
         return mProperties.remove(key);
     }
 
-}
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/org/mozilla/javascript/ContextWrapper.java b/autojs/src/main/java/org/mozilla/javascript/ContextWrapper.java
index 3f7b60a88..15ca0b1a0 100644
--- a/autojs/src/main/java/org/mozilla/javascript/ContextWrapper.java
+++ b/autojs/src/main/java/org/mozilla/javascript/ContextWrapper.java
@@ -197,7 +197,7 @@ public static void setCachingEnabled(boolean cachingEnabled) {
         Context.setCachingEnabled(cachingEnabled);
     }
 
-    public static DebuggableScript getDebuggableView(Script script) {
+    public static DebuggableScript getDebuggableView(ScriptOrFn<?> script) {
         return Context.getDebuggableView(script);
     }
 
diff --git a/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java b/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
deleted file mode 100644
index 5ebbf4b19..000000000
--- a/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.mozilla.javascript;
-
-import android.os.Looper;
-import android.util.Log;
-
-import com.stardust.autojs.engine.RhinoJavaScriptEngine;
-import com.stardust.autojs.rhino.AutoJsContext;
-
-import org.mozilla.javascript.jdk18.VMBridge_jdk18;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class VMBridge_custom extends VMBridge_jdk18 {
-
-    private static final String LOG_TAG = "VMBridge_custom";
-
-    public VMBridge_custom() throws SecurityException, InstantiationException {
-    }
-
-    @Override
-    protected Object newInterfaceProxy(Object proxyHelper, ContextFactory cf, InterfaceAdapter adapter, Object target, Scriptable topScope) {
-        Context context = Context.getCurrentContext();
-        InterfaceAdapterWrapper adapterWrapper = new InterfaceAdapterWrapper(adapter, context);
-        // --- The following code is copied from super class --
-        Constructor<?> c = (Constructor) proxyHelper;
-        InvocationHandler handler = (proxy, method, args) -> {
-            if (method.getDeclaringClass() == Object.class) {
-                String methodName = method.getName();
-                if (methodName.equals("equals")) {
-                    Object other = args[0];
-                    return proxy == other;
-                }
-
-                if (methodName.equals("hashCode")) {
-                    return target.hashCode();
-                }
-
-                if (methodName.equals("toString")) {
-                    return "Proxy[" + target.toString() + "]";
-                }
-            }
-            // Add thread check
-            //Check if the current thread is ui thread
-            if (Looper.myLooper() == Looper.getMainLooper()) {
-                // If so, catch any exception of invoking
-                // Because an exception on ui thread will cause the whole app to crash
-                try {
-                    Object result = adapterWrapper.invoke(cf, target, topScope, proxy, method, args);
-                    return castReturnValue(method, result);
-                } catch (ContinuationPending pending) {
-                    return defaultValue(method.getReturnType());
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                    if (context instanceof AutoJsContext) {
-                        // notify the script thread to exit
-                        com.stardust.autojs.runtime.ScriptRuntime runtime = ((AutoJsContext) context).getRhinoJavaScriptEngine().getRuntime();
-                        Log.d(LOG_TAG, "runtime = " + runtime);
-                        runtime.exit(e);
-                    }
-                    // even if we caught the exception, we must return a value to for the method call.
-                    return defaultValue(method.getReturnType());
-                }
-            } else {
-                return castReturnValue(method, adapterWrapper.invoke(cf, target, topScope, proxy, method, args));
-            }
-        };
-
-        // --- The following code is copied from super class --
-        try {
-            Object proxy = c.newInstance(handler);
-            return proxy;
-        } catch (InvocationTargetException var10) {
-            throw Context.throwAsScriptRuntimeEx(var10);
-        } catch (IllegalAccessException var11) {
-            throw new IllegalStateException(var11);
-        } catch (InstantiationException var12) {
-            throw new IllegalStateException(var12);
-        }
-    }
-
-    // cast the return value to boolean if needed.
-    // if a javascript function that implements a java interface returns nothing,
-    // it will be regarded as "false", like javascript behavior, instead of reporting error "undefined cannot be cast to boolean"
-    protected Object castReturnValue(Method method, Object returnValue) {
-        if (method.getReturnType().equals(Boolean.TYPE) || method.getReturnType().equals(Boolean.class)) {
-            return ScriptRuntime.toBoolean(returnValue);
-        }
-        return returnValue;
-    }
-
-    protected Object defaultValue(Class<?> type) {
-        if (type.equals(Boolean.TYPE) || type.equals(Boolean.class)) {
-            return false;
-        }
-        if (type.equals(Integer.TYPE) || type.equals(Integer.class)) {
-            return 0;
-        }
-        if (type.equals(Long.TYPE) || type.equals(Long.class)) {
-            return 0L;
-        }
-        if (type.equals(Float.TYPE) || type.equals(Float.class)) {
-            return 0F;
-        }
-        if (type.equals(Double.TYPE) || type.equals(Double.class)) {
-            return 0.0;
-        }
-        if (type.equals(Byte.TYPE) || type.equals(Byte.class)) {
-            return (byte) 0;
-        }
-        if (type.equals(Character.TYPE) || type.equals(Character.class)) {
-            return (char) 0;
-        }
-        if (type.isAssignableFrom(CharSequence.class)) {
-            return "";
-        }
-        return null;
-    }
-
-    private class InterfaceAdapterWrapper {
-
-        private final InterfaceAdapter mInterfaceAdapter;
-        private final Context mCallerContext;
-
-        private InterfaceAdapterWrapper(InterfaceAdapter interfaceAdapter, Context callerContext) {
-            mInterfaceAdapter = interfaceAdapter;
-            mCallerContext = callerContext;
-        }
-
-        public Object invoke(ContextFactory cf, Object target, Scriptable topScope, Object thisObject, Method method, Object[] args) {
-            ContextAction action = cx -> invokeImpl(cx, target, topScope, thisObject, method, args);
-            return call(cf, action);
-        }
-
-        private Object call(ContextFactory cf, ContextAction action) {
-            Context cx = Context.enter(null, cf);
-            //TODO null check
-            cx.setWrapFactory(mCallerContext.getWrapFactory());
-            try {
-                return action.run(cx);
-            } finally {
-                Context.exit();
-            }
-        }
-
-
-        public Object invokeImpl(Context cx, Object target, Scriptable topScope, Object thisObject, Method method, Object[] args) {
-            cx.isContinuationsTopCall = true;
-            return mInterfaceAdapter.invokeImpl(cx, target, topScope, thisObject, method, args);
-        }
-    }
-}
diff --git a/autojs/src/main/js/v6-api/src/ui/ui.ts b/autojs/src/main/js/v6-api/src/ui/ui.ts
index db061b5cc..a9c36fcc4 100644
--- a/autojs/src/main/js/v6-api/src/ui/ui.ts
+++ b/autojs/src/main/js/v6-api/src/ui/ui.ts
@@ -57,7 +57,6 @@ const __inflate__ = function (ctx: android.Context, xml: XML | string,
     return runtime.ui.layoutInflater.inflate(ctx, xml.toString(), parent, attachToParent);
 }
 
-
 export const findView = function (id: string): android.View | null {
     return findById(id);
 }
@@ -72,10 +71,10 @@ export const run = function <T>(action: () => T) {
     runtime.getUiHandler().post(function () {
         try {
             result = action();
-            disposable.setAndNotify(true);
+            disposable.setAndNotify(null);
         } catch (e) {
             err = e;
-            disposable.setAndNotify(true);
+            disposable.setAndNotify(null);
         }
     });
     disposable.blockedGet();
diff --git a/common/src/main/java/com/stardust/concurrent/VolatileDispose.java b/common/src/main/java/com/stardust/concurrent/VolatileDispose.java
index d92e6f68a..d0ce3783a 100644
--- a/common/src/main/java/com/stardust/concurrent/VolatileDispose.java
+++ b/common/src/main/java/com/stardust/concurrent/VolatileDispose.java
@@ -7,69 +7,61 @@
 public class VolatileDispose<T> {
 
     private volatile T mValue;
+    /** 与 mValue 分开记录「是否已 set」，使 setAndNotify(null) 也能正确唤醒等待方。 */
+    private volatile boolean mSet;
 
     public T blockedGet() {
         synchronized (this) {
-            if (mValue != null) {
-                return mValue;
-            }
-            try {
-                this.wait();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+            while (!mSet) {
+                try {
+                    this.wait();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
             }
+            return mValue;
         }
-        return mValue;
     }
 
     public T blockedGetOrThrow(Class<? extends RuntimeException> exception) {
         synchronized (this) {
-            if (mValue != null) {
-                return mValue;
-            }
-            try {
-                this.wait();
-            } catch (InterruptedException e) {
+            while (!mSet) {
                 try {
-                    throw exception.newInstance();
-                } catch (InstantiationException e1) {
-                    throw new RuntimeException(e1);
-                } catch (IllegalAccessException e1) {
-                    throw new RuntimeException(e1);
+                    this.wait();
+                } catch (InterruptedException e) {
+                    try {
+                        throw exception.newInstance();
+                    } catch (InstantiationException | IllegalAccessException e1) {
+                        throw new RuntimeException(e1);
+                    }
                 }
             }
+            return mValue;
         }
-        return mValue;
     }
 
     public T blockedGetOrThrow(Class<? extends RuntimeException> exception, long timeout, T defaultValue) {
         synchronized (this) {
-            if (mValue != null) {
-                return mValue;
-            }
-            try {
-                this.wait(timeout);
-            } catch (InterruptedException e) {
+            if (!mSet) {
                 try {
-                    throw exception.newInstance();
-                } catch (InstantiationException e1) {
-                    throw new RuntimeException(e1);
-                } catch (IllegalAccessException e1) {
-                    throw new RuntimeException(e1);
+                    this.wait(timeout);
+                } catch (InterruptedException e) {
+                    try {
+                        throw exception.newInstance();
+                    } catch (InstantiationException | IllegalAccessException e1) {
+                        throw new RuntimeException(e1);
+                    }
                 }
             }
-            if (mValue == null) {
-                return defaultValue;
-            }
+            return mSet ? mValue : defaultValue;
         }
-        return mValue;
     }
 
     public void setAndNotify(T value) {
         synchronized (this) {
             mValue = value;
-            notify();
+            mSet = true;
+            notifyAll();
         }
     }
-
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 139cf6608..b4e11bcf6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -64,9 +64,9 @@ compose-animation = { module = "androidx.compose.animation:animation" }
 
 ##########################
 # rhino
-mozilla-rhino = "org.mozilla:rhino:1.8.1"
-mozilla-rhino-xml = "org.mozilla:rhino-xml:1.8.1"
-mozilla-rhino-tools = "org.mozilla:rhino-tools:1.8.1"
+mozilla-rhino = "org.mozilla:rhino:1.9.2"
+mozilla-rhino-xml = "org.mozilla:rhino-xml:1.9.2"
+mozilla-rhino-tools = "org.mozilla:rhino-tools:1.9.2"
 # opencv
 opencv = "org.opencv:opencv:4.12.0"
 # commons