From 29cbcbd25a9d56fc8147f71abfd4ad7325b5f31b Mon Sep 17 00:00:00 2001
From: aiselp <aiselpk@gmail.com>
Date: Thu, 14 Sep 2023 21:09:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autojs/engine/RhinoJavaScriptEngine.kt    | 52 ++++-------
 .../stardust/autojs/runtime/api/Timers.java   | 93 -------------------
 .../com/stardust/autojs/runtime/api/Timers.kt | 70 ++++++++++++++
 3 files changed, 88 insertions(+), 127 deletions(-)
 delete mode 100644 autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
 create mode 100644 autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.kt

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 51dfa0a0e..dd1563689 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
@@ -13,12 +13,14 @@ import com.stardust.autojs.runtime.ScriptRuntime
 import com.stardust.autojs.script.JavaScriptSource
 import com.stardust.automator.UiObjectCollection
 import com.stardust.pio.UncheckedIOException
-import org.mozilla.javascript.*
+import org.mozilla.javascript.Context
+import org.mozilla.javascript.Script
+import org.mozilla.javascript.Scriptable
+import org.mozilla.javascript.ScriptableObject
 import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider
 import java.io.IOException
 import java.io.InputStreamReader
-import java.io.Reader
-import java.util.*
+import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -28,31 +30,24 @@ import java.util.concurrent.ConcurrentHashMap
 open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Context) :
     JavaScriptEngine() {
 
-    val context: Context
-    private val mScriptable: TopLevelScope
+    val context: Context = enterContext()
+    private val mScriptable: TopLevelScope = createScope(this.context)
     lateinit var thread: Thread
         private set
 
-    private val initScript: Script
-        get() {
-            return sInitScript ?: try {
-                val reader = InputStreamReader(mAndroidContext.assets.open("init.js"))
-                val script = context.compileReader(reader, SOURCE_NAME_INIT, 1, null)
-                sInitScript = script
-                script
-            } catch (e: IOException) {
-                throw UncheckedIOException(e)
-            }
+    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
+        } catch (e: IOException) {
+            throw UncheckedIOException(e)
         }
+    }
 
     val scriptable: Scriptable
         get() = mScriptable
 
-    init {
-        this.context = enterContext()
-        mScriptable = createScope(this.context)
-    }
-
     override fun put(name: String, value: Any?) {
         ScriptableObject.putProperty(mScriptable, name, Context.javaToJS(value, mScriptable))
     }
@@ -63,9 +58,8 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
     }
 
     public override fun doExecution(source: JavaScriptSource): Any? {
-        var reader = source.nonNullScriptReader
+        val reader = source.nonNullScriptReader
         try {
-            reader = preprocess(reader)
             val script = context.compileReader(reader, source.toString(), 1, null)
             return if (hasFeature(ScriptConfig.FEATURE_CONTINUATION)) {
                 context.executeScriptWithContinuations(script, mScriptable)
@@ -83,10 +77,6 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
         return config != null && config.scriptConfig.hasFeature(feature)
     }
 
-    @Throws(IOException::class)
-    protected fun preprocess(script: Reader): Reader {
-        return script
-    }
 
     override fun forceStop() {
         Log.d(LOG_TAG, "forceStop: interrupt Thread: $thread")
@@ -179,16 +169,10 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
     }
 
     companion object {
+        const val SOURCE_NAME_INIT = "<init>"
+        private const val LOG_TAG = "RhinoJavaScriptEngine"
 
-        val SOURCE_NAME_INIT = "<init>"
-
-        private val LOG_TAG = "RhinoJavaScriptEngine"
-
-        private val MODULES_PATH = "modules"
-        private var sInitScript: Script? = null
         private val sContextEngineMap = ConcurrentHashMap<Context, RhinoJavaScriptEngine>()
-
-
         fun getEngineOfContext(context: Context): RhinoJavaScriptEngine? {
             return sContextEngineMap[context]
         }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
deleted file mode 100644
index 66a3619ce..000000000
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.stardust.autojs.runtime.api;
-
-import android.os.Handler;
-import android.os.Looper;
-import android.os.SystemClock;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.stardust.autojs.core.looper.Timer;
-import com.stardust.autojs.core.looper.TimerThread;
-import com.stardust.autojs.runtime.ScriptBridges;
-import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.concurrent.VolatileBox;
-
-/**
- * Created by Stardust on 2017/7/21.
- */
-
-public class Timers {
-
-    private static final String LOG_TAG = "Timers";
-
-    //private VolatileBox<Long> mMaxCallbackUptimeMillisForAllThreads = new VolatileBox<>(0L);
-    private Threads mThreads;
-    private Timer mUiTimer;
-    private ScriptRuntime mRuntime;
-
-    public Timers(ScriptRuntime runtime) {
-        mUiTimer = new Timer(runtime, Looper.getMainLooper());
-        mThreads = runtime.threads;
-        mRuntime = runtime;
-    }
-
-    public Timer getMainTimer() {
-        return mRuntime.loopers.getMTimer();
-    }
-
-    public Timer getTimerForCurrentThread() {
-        return getTimerForThread(Thread.currentThread());
-    }
-
-    public Timer getTimerForThread(Thread thread) {
-        if (thread == mThreads.getMainThread()) {
-            return mRuntime.loopers.getMTimer();
-        }
-        Timer timer = TimerThread.getTimerForThread(thread);
-        if (timer == null && Looper.myLooper() == Looper.getMainLooper()) {
-            return mUiTimer;
-        }
-        if (timer == null) {
-            return mRuntime.loopers.getMTimer();
-        } else {
-            return timer;
-        }
-    }
-
-    public int setTimeout(Object callback, long delay, Object... args) {
-        return getTimerForCurrentThread().setTimeout(callback, delay, args);
-    }
-
-    public int setTimeout(Object callback) {
-        return setTimeout(callback, 1);
-    }
-
-    public boolean clearTimeout(int id) {
-        return getTimerForCurrentThread().clearTimeout(id);
-    }
-
-    public int setInterval(Object listener, long interval, Object... args) {
-        return getTimerForCurrentThread().setInterval(listener, interval, args);
-    }
-
-    public int setInterval(Object listener) {
-        return setInterval(listener, 1);
-    }
-
-    public boolean clearInterval(int id) {
-        return getTimerForCurrentThread().clearInterval(id);
-    }
-
-    public int setImmediate(Object listener, Object... args) {
-        return getTimerForCurrentThread().setImmediate(listener, args);
-    }
-
-    public boolean clearImmediate(int id) {
-        return getTimerForCurrentThread().clearImmediate(id);
-    }
-
-    public void recycle() {
-        mRuntime.loopers.getMTimer().removeAllCallbacks();
-    }
-
-}
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.kt b/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.kt
new file mode 100644
index 000000000..73b86515e
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.kt
@@ -0,0 +1,70 @@
+package com.stardust.autojs.runtime.api
+
+import android.os.Looper
+import com.stardust.autojs.core.looper.Timer
+import com.stardust.autojs.core.looper.TimerThread
+import com.stardust.autojs.runtime.ScriptRuntime
+
+/**
+ * Created by Stardust on 2017/7/21.
+ */
+class Timers(private val mRuntime: ScriptRuntime) {
+    private val mThreads: Threads = mRuntime.threads
+    private val mUiTimer: Timer = Timer(mRuntime, Looper.getMainLooper())
+    val mainTimer
+        get() = mRuntime.loopers.mTimer
+
+    val timerForCurrentThread: Timer
+        get() = getTimerForThread(Thread.currentThread())
+
+    fun getTimerForThread(thread: Thread): Timer {
+        if (thread === mThreads.mainThread) {
+            return mRuntime.loopers.mTimer
+        }
+        val timer = TimerThread.getTimerForThread(thread)
+        return if (timer == null && Looper.myLooper() == Looper.getMainLooper()) {
+            mUiTimer
+        } else timer ?: mainTimer
+    }
+
+    fun setTimeout(callback: Any, delay: Long, vararg args: Any?): Int {
+        return timerForCurrentThread.setTimeout(callback, delay, *args)
+    }
+
+    fun setTimeout(callback: Any): Int {
+        return setTimeout(callback, 1)
+    }
+
+    fun setImmediate(listener: Any, vararg args: Any?): Int {
+        return timerForCurrentThread.setImmediate(listener, *args)
+    }
+
+
+    fun setInterval(listener: Any, interval: Long, vararg args: Any?): Int {
+        return timerForCurrentThread.setInterval(listener, interval, *args)
+    }
+
+    fun setInterval(listener: Any): Int {
+        return setInterval(listener, 1)
+    }
+
+    fun clearTimeout(id: Int): Boolean {
+        return timerForCurrentThread.clearTimeout(id)
+    }
+
+    fun clearInterval(id: Int): Boolean {
+        return timerForCurrentThread.clearInterval(id)
+    }
+
+    fun clearImmediate(id: Int): Boolean {
+        return timerForCurrentThread.clearImmediate(id)
+    }
+
+    fun recycle() {
+        mainTimer.removeAllCallbacks()
+    }
+
+    companion object {
+        private const val LOG_TAG = "Timers"
+    }
+}
\ No newline at end of file

From 7f86d2bbddc2c7020b3a2913f2cb6ef12e196ccc Mon Sep 17 00:00:00 2001
From: aiselp <aiselpk@gmail.com>
Date: Thu, 14 Sep 2023 22:16:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autojs/src/main/assets/modules/__images__.js  |  2 +-
 .../main/java/com/stardust/autojs/AutoJs.java |  4 +-
 .../autojs/core/ui/nativeview/NativeView.java |  7 +-
 .../autojs/engine/RhinoJavaScriptEngine.kt    | 23 ++----
 .../autojs/rhino/AndroidContextFactory.java   | 54 ------------
 .../autojs/rhino/AndroidContextFactory.kt     | 82 +++++++++++++++++++
 .../InterruptibleAndroidContextFactory.java   | 55 -------------
 .../stardust/autojs/runtime/ScriptBridges.kt  | 20 +++--
 8 files changed, 107 insertions(+), 140 deletions(-)
 delete mode 100644 autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.java
 create mode 100644 autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt
 delete mode 100644 autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java

diff --git a/autojs/src/main/assets/modules/__images__.js b/autojs/src/main/assets/modules/__images__.js
index d2a2e3db7..be6de96ad 100644
--- a/autojs/src/main/assets/modules/__images__.js
+++ b/autojs/src/main/assets/modules/__images__.js
@@ -13,7 +13,7 @@ module.exports = function (runtime, scope) {
             if (Array.isArray(list)) {
                 this.matches = list;
             } else {
-                this.matches = runtime.bridges.bridges.toArray(list);
+                this.matches = runtime.bridges.toArray(list);
             }
             this.__defineGetter__("points", () => {
                 if (typeof (this.__points__) == 'undefined') {
diff --git a/autojs/src/main/java/com/stardust/autojs/AutoJs.java b/autojs/src/main/java/com/stardust/autojs/AutoJs.java
index 5d9592418..0dca35c7f 100644
--- a/autojs/src/main/java/com/stardust/autojs/AutoJs.java
+++ b/autojs/src/main/java/com/stardust/autojs/AutoJs.java
@@ -22,7 +22,7 @@
 import com.stardust.autojs.engine.LoopBasedJavaScriptEngine;
 import com.stardust.autojs.engine.RootAutomatorEngine;
 import com.stardust.autojs.engine.ScriptEngineManager;
-import com.stardust.autojs.rhino.InterruptibleAndroidContextFactory;
+import com.stardust.autojs.rhino.AndroidContextFactory;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
 import com.stardust.autojs.runtime.api.AppUtils;
@@ -133,7 +133,7 @@ protected void initScriptEngineManager() {
     }
 
     protected void initContextFactory() {
-        ContextFactory.initGlobal(new InterruptibleAndroidContextFactory(new File(mContext.getCacheDir(), "classes")));
+        ContextFactory.initGlobal(new AndroidContextFactory(new File(mContext.getCacheDir(), "classes")));
     }
 
     protected ScriptRuntime createRuntime() {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/NativeView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/NativeView.java
index acd822439..8a10bba31 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/NativeView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/NativeView.java
@@ -1,17 +1,14 @@
 package com.stardust.autojs.core.ui.nativeview;
 
-import android.graphics.PorterDuff;
 import android.view.View;
-import android.widget.Button;
 
 import com.stardust.autojs.core.ui.JsViewHelper;
 import com.stardust.autojs.core.ui.ViewExtras;
 import com.stardust.autojs.core.ui.attribute.ViewAttributes;
 import com.stardust.autojs.rhino.NativeJavaObjectWithPrototype;
+import com.stardust.autojs.runtime.ScriptRuntime;
 
-import org.mozilla.javascript.NativeJavaObject;
 import org.mozilla.javascript.NativeObject;
-import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
 
 public class NativeView extends NativeJavaObjectWithPrototype {
@@ -45,7 +42,7 @@ public LongClickEvent(View view) {
     private final View mView;
     private final ViewPrototype mViewPrototype;
 
-    public NativeView(Scriptable scope, View view, Class<?> staticType, com.stardust.autojs.runtime.ScriptRuntime runtime) {
+    public NativeView(Scriptable scope, View view, Class<?> staticType, ScriptRuntime runtime) {
         super(scope, view, staticType);
         mViewAttributes = ViewExtras.getViewAttributes(view, runtime.ui.getResourceParser());
         mView = view;
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 dd1563689..b502179a2 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
@@ -7,11 +7,11 @@ import com.stardust.autojs.engine.module.AssetAndUrlModuleSourceProvider
 import com.stardust.autojs.engine.module.ScopeRequire
 import com.stardust.autojs.execution.ExecutionConfig
 import com.stardust.autojs.project.ScriptConfig
+import com.stardust.autojs.rhino.AndroidContextFactory
 import com.stardust.autojs.rhino.RhinoAndroidHelper
 import com.stardust.autojs.rhino.TopLevelScope
 import com.stardust.autojs.runtime.ScriptRuntime
 import com.stardust.autojs.script.JavaScriptSource
-import com.stardust.automator.UiObjectCollection
 import com.stardust.pio.UncheckedIOException
 import org.mozilla.javascript.Context
 import org.mozilla.javascript.Script
@@ -20,7 +20,6 @@ import org.mozilla.javascript.ScriptableObject
 import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider
 import java.io.IOException
 import java.io.InputStreamReader
-import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -48,12 +47,17 @@ 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))
     }
 
     override fun setRuntime(runtime: ScriptRuntime) {
         super.setRuntime(runtime)
+        runtime.bridges.setup(this)
         runtime.topLevelScope = mScriptable
     }
 
@@ -135,23 +139,12 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
         return context
     }
 
-    protected fun setupContext(context: Context) {
-        context.optimizationLevel = -1
-        context.languageVersion = Context.VERSION_ES6
-        context.locale = Locale.getDefault()
+    private fun setupContext(context: Context) {
         context.wrapFactory = WrapFactory()
     }
 
-    private inner class WrapFactory : org.mozilla.javascript.WrapFactory() {
-
-        override fun wrap(cx: Context, scope: Scriptable, obj: Any?, staticType: Class<*>?): Any? {
-            return when {
-                obj is String -> runtime.bridges.toString(obj.toString())
-                staticType == UiObjectCollection::class.java -> runtime.bridges.asArray(obj as UiObjectCollection)
-                else -> super.wrap(cx, scope, obj, staticType)
-            }
-        }
 
+    private inner class WrapFactory : AndroidContextFactory.WrapFactory() {
         override fun wrapAsJavaObject(
             cx: Context?,
             scope: Scriptable,
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.java b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.java
deleted file mode 100644
index 25252b276..000000000
--- a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.stardust.autojs.rhino;
-
-
-import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.tools.shell.ShellContextFactory;
-
-import java.io.File;
-
-/**
- * Created by Stardust on 2017/4/5.
- */
-
-public class AndroidContextFactory extends ShellContextFactory {
-    private final File cacheDirectory;
-
-    /**
-     * Create a new factory. It will cache generated code in the given directory
-     *
-     * @param cacheDirectory the cache directory
-     */
-    public AndroidContextFactory(File cacheDirectory) {
-        this.cacheDirectory = cacheDirectory;
-        initApplicationClassLoader(createClassLoader(AndroidContextFactory.class.getClassLoader()));
-    }
-
-    /**
-     * Create a ClassLoader which is able to deal with bytecode
-     *
-     * @param parent the parent of the create classloader
-     * @return a new ClassLoader
-     */
-    @Override
-    protected AndroidClassLoader createClassLoader(ClassLoader parent) {
-        return new AndroidClassLoader(parent, cacheDirectory);
-    }
-
-    @Override
-    protected void observeInstructionCount(Context cx, int instructionCount) {
-        if (Thread.currentThread().isInterrupted()) {
-            throw new ScriptInterruptedException();
-        }
-    }
-
-    @Override
-    protected Context makeContext() {
-        Context cx = super.makeContext();
-        cx.setInstructionObserverThreshold(10000);
-        return cx;
-    }
-
-
-}
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt
new file mode 100644
index 000000000..a28e88698
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidContextFactory.kt
@@ -0,0 +1,82 @@
+package com.stardust.autojs.rhino
+
+import android.os.Looper
+import android.util.Log
+import com.stardust.autojs.runtime.ScriptBridges
+import com.stardust.autojs.runtime.exception.ScriptInterruptedException
+import com.stardust.automator.UiObjectCollection
+import org.mozilla.javascript.Context
+import org.mozilla.javascript.ContextFactory
+import org.mozilla.javascript.Scriptable
+import java.io.File
+import java.util.Locale
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * Created by Stardust on 2017/4/5.
+ */
+open class AndroidContextFactory(private val cacheDirectory: File) : ContextFactory() {
+    companion object {
+        const val LOG_TAG = "ContextFactory"
+        val bridges = ScriptBridges()
+    }
+
+    private val mContextCount = AtomicInteger()
+    private val wrapFactory = WrapFactory()
+
+    init {
+        initApplicationClassLoader(createClassLoader(AndroidContextFactory::class.java.classLoader!!))
+    }
+
+    /**
+     * Create a ClassLoader which is able to deal with bytecode
+     *
+     * @param parent the parent of the create classloader
+     * @return a new ClassLoader
+     */
+    final override fun createClassLoader(parent: ClassLoader): AndroidClassLoader {
+        return AndroidClassLoader(parent, cacheDirectory)
+    }
+
+    override fun observeInstructionCount(cx: Context, instructionCount: Int) {
+        if (Thread.currentThread().isInterrupted && Looper.myLooper() != Looper.getMainLooper()) {
+            throw ScriptInterruptedException()
+        }
+    }
+
+    override fun makeContext(): Context {
+        val cx: Context = AutoJsContext(this)
+        setupContext(cx)
+        return cx
+    }
+
+    private fun setupContext(context: Context) {
+        context.instructionObserverThreshold = 10000
+        context.optimizationLevel = -1
+        context.languageVersion = Context.VERSION_ES6
+        context.locale = Locale.getDefault()
+        context.wrapFactory = wrapFactory
+    }
+
+    override fun onContextCreated(cx: Context) {
+        super.onContextCreated(cx)
+        val i = mContextCount.incrementAndGet()
+        Log.d(LOG_TAG, "onContextCreated: count = $i")
+    }
+
+    override fun onContextReleased(cx: Context) {
+        super.onContextReleased(cx)
+        val i = mContextCount.decrementAndGet()
+        Log.d(LOG_TAG, "onContextReleased: count = $i")
+    }
+
+    open class WrapFactory : org.mozilla.javascript.WrapFactory() {
+        override fun wrap(cx: Context, scope: Scriptable, obj: Any?, staticType: Class<*>?): Any? {
+            return when {
+                obj is String -> bridges.toString(obj.toString())
+                staticType == UiObjectCollection::class.java -> bridges.asArray(obj as UiObjectCollection)
+                else -> super.wrap(cx, scope, obj, staticType)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java b/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java
deleted file mode 100644
index 07fcc61bc..000000000
--- a/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.stardust.autojs.rhino;
-
-import android.os.Looper;
-import android.util.Log;
-
-import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-
-import org.mozilla.javascript.Context;
-
-import java.io.File;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class InterruptibleAndroidContextFactory extends AndroidContextFactory {
-
-    private AtomicInteger mContextCount = new AtomicInteger();
-    private static final String LOG_TAG = "ContextFactory";
-
-    /**
-     * Create a new factory. It will cache generated code in the given directory
-     *
-     * @param cacheDirectory the cache directory
-     */
-    public InterruptibleAndroidContextFactory(File cacheDirectory) {
-        super(cacheDirectory);
-    }
-
-    @Override
-    protected void observeInstructionCount(Context cx, int instructionCount) {
-        if (Thread.currentThread().isInterrupted() && Looper.myLooper() != Looper.getMainLooper()) {
-            throw new ScriptInterruptedException();
-        }
-    }
-
-    @Override
-    protected Context makeContext() {
-        Context cx = new AutoJsContext(this);
-        cx.setInstructionObserverThreshold(10000);
-        return cx;
-    }
-
-    @Override
-    protected void onContextCreated(Context cx) {
-        super.onContextCreated(cx);
-        int i = mContextCount.incrementAndGet();
-        Log.d(LOG_TAG, "onContextCreated: count = " + i);
-    }
-
-    @Override
-    protected void onContextReleased(Context cx) {
-        super.onContextReleased(cx);
-        int i = mContextCount.decrementAndGet();
-        Log.d(LOG_TAG, "onContextReleased: count = " + i);
-    }
-
-}
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 d2fc080a6..c532a1af9 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.kt
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.kt
@@ -1,5 +1,6 @@
 package com.stardust.autojs.runtime
 
+import com.stardust.autojs.engine.RhinoJavaScriptEngine
 import com.stardust.automator.UiObjectCollection
 import org.mozilla.javascript.BaseFunction
 import org.mozilla.javascript.BoundFunction
@@ -13,14 +14,17 @@ import org.mozilla.javascript.annotations.JSFunction
  * Created by Stardust on 2017/7/21.
  */
 class ScriptBridges {
-    companion object {
-        fun <T> useJsContext(f: (context: Context) -> T): T {
-            val context = Context.getCurrentContext()
-            try {
-                return f(context ?: Context.enter())
-            } finally {
-                context ?: Context.exit()
-            }
+    var engine: RhinoJavaScriptEngine? = null
+    fun setup(engine: RhinoJavaScriptEngine) {
+        this.engine = engine
+    }
+
+    private fun <T> useJsContext(f: (context: Context) -> T): T {
+        val context = Context.getCurrentContext()
+        try {
+            return f(context ?: engine?.enterContext() ?: Context.enter())
+        } finally {
+            context ?: Context.exit()
         }
     }
 

From dfcf191ebd050397f3981ad1126412b132635b42 Mon Sep 17 00:00:00 2001
From: aiselp <aiselpk@gmail.com>
Date: Fri, 15 Sep 2023 14:59:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/explorer/WorkspaceFileProvider.java |  2 +-
 .../autojs/autojs/ui/build/BuildViewModel.kt  | 47 +++++------
 .../autojs/ui/build/ProjectConfigActivity.kt  |  4 +-
 .../ui/explorer/ExplorerProjectToolbar.kt     |  9 ++-
 .../stardust/autojs/project/ProjectConfig.kt  | 77 ++++---------------
 .../autojs/project/ProjectLauncher.kt         |  2 +-
 6 files changed, 49 insertions(+), 92 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java b/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java
index aa5cab086..339ff9d6a 100644
--- a/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java
+++ b/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java
@@ -41,7 +41,7 @@ public Single<? extends ExplorerPage> getExplorerPage(ExplorerPage page) {
         return listFiles(new PFile(path))
                 .collectInto(createExplorerPage(path, parent), (p, file) -> {
                     if (file.isDirectory()) {
-                        ProjectConfig projectConfig = ProjectConfig.Companion.fromProjectDir(file.getPath());
+                        ProjectConfig projectConfig = ProjectConfig.Companion.fromProject(file);
                         if (projectConfig != null) {
                             p.addChild(new ExplorerProjectPage(file, parent, projectConfig));
                             return;
diff --git a/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt b/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
index 661b1bf2e..9175d72d6 100644
--- a/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
@@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.autojs.autojs.Pref
-import org.autojs.autoxjs.R
 import org.autojs.autojs.build.ApkBuilder
 import org.autojs.autojs.build.ApkBuilderPluginHelper
 import org.autojs.autojs.build.ApkKeyStore
@@ -35,6 +34,7 @@ import org.autojs.autojs.model.explorer.ExplorerFileItem
 import org.autojs.autojs.model.explorer.Explorers
 import org.autojs.autojs.model.script.ScriptFile
 import org.autojs.autojs.tool.*
+import org.autojs.autoxjs.R
 import java.io.File
 import java.net.URLDecoder
 
@@ -57,6 +57,7 @@ class BuildViewModelFactory(
  */
 class BuildViewModel(private val app: Application, private var source: String) :
     AndroidViewModel(app) {
+    private val mainScope = CoroutineScope(Dispatchers.Main)
 
     companion object {
         const val TAG = "BuildViewModel"
@@ -198,13 +199,13 @@ class BuildViewModel(private val app: Application, private var source: String) :
         }
     ) {
         syncToProjectConfig()
-        CoroutineScope(Dispatchers.Main).launch {
+        mainScope.launch {
             writeProjectConfigAndRefreshView()
             onCompletion()
         }
     }
 
-    suspend fun writeProjectConfigAndRefreshView() {
+    private suspend fun writeProjectConfigAndRefreshView() {
         withContext(Dispatchers.IO) {
             saveLogo()
             saveSplashIcon()
@@ -212,6 +213,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
                 ProjectConfig.configFileOfDir(directory!!, configName),
                 projectConfig.toJson()
             )
+            println(projectConfig.toJson())
         }
         withContext(Dispatchers.Main) {
             oldProjectConfig = projectConfig.copy()
@@ -220,13 +222,13 @@ class BuildViewModel(private val app: Application, private var source: String) :
         }
     }
 
-    val configName: String
+    private val configName: String
         get() = if (isSingleFile) {
             //test.js对应test_config.json
             PFiles.getNameWithoutExtension(source) + "_config.json"
         } else ProjectConfig.CONFIG_FILE_NAME
 
-    fun getConfigName1(isSingleFile: Boolean = this.isSingleFile): String {
+    private fun getConfigName1(isSingleFile: Boolean = this.isSingleFile): String {
         return if (isSingleFile) {
             //test.js对应test_config.json
             PFiles.getNameWithoutExtension(source) + "_config.json"
@@ -236,7 +238,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
     /**
      * 从viewModel保存配置
      */
-    fun syncToProjectConfig() {
+    private fun syncToProjectConfig() {
         if (
             projectConfig.mainScript.isNullOrEmpty()
             && source.isNotEmpty()
@@ -279,7 +281,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
         }
     }
 
-    fun syncViewModelByConfig(projectConfig: ProjectConfig) {
+    private fun syncViewModelByConfig(projectConfig: ProjectConfig) {
 
         projectConfig.sourcePath?.takeIf { it.isNotBlank() }?.let { sourcePath = it }
         projectConfig.outputPath?.takeIf { it.isNotBlank() }?.let { outputPath = it }
@@ -409,7 +411,9 @@ class BuildViewModel(private val app: Application, private var source: String) :
         var isRequiredMlKitOCRModels = false
         projectConfig.libs.let {
             when {
-                it.containsAll(Constant.Libraries.GOOGLE_ML_KIT_OCR) -> isRequiredMlKitOCRLibs = true
+                it.containsAll(Constant.Libraries.GOOGLE_ML_KIT_OCR) -> isRequiredMlKitOCRLibs =
+                    true
+
                 it.containsAll(Constant.Libraries.PADDLE_OCR) -> isRequiredPaddleOCR = true
                 it.containsAll(Constant.Libraries.TESSERACT_OCR) -> isRequiredTesseractOCR = true
                 it.containsAll(Constant.Libraries.P7ZIP) -> isRequired7Zip = true
@@ -433,6 +437,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
             when (it) {
                 Constant.Permissions.ACCESSIBILITY_SERVICES -> isRequiredAccessibilityServices =
                     true
+
                 Constant.Permissions.BACKGROUND_START -> isRequiredBackgroundStart = true
                 Constant.Permissions.DRAW_OVERLAY -> isRequiredDrawOverlay = true
             }
@@ -493,19 +498,15 @@ class BuildViewModel(private val app: Application, private var source: String) :
         }
     }
 
-    private suspend fun setSource(file: File) {
-        if (file.isFile) {
-            //如果是文件
+    private fun setSource(file: File) {
+        if (file.isFile) { //如果是文件
             directory = file.parent
             sourcePath = file.path
-            //尝试获取配置文件
-            oldProjectConfig =
-                ProjectConfig.fromProjectDirAsync(directory!!, configName)
-        } else {
-            //如果是目录
+        } else { //如果是目录
             directory = source
-            oldProjectConfig = ProjectConfig.fromProjectDirAsync(file.path)
         }
+        oldProjectConfig = ProjectConfig.fromProject(file)
+
         oldProjectConfig?.let {
             isOldProjectConfigExist = true
             projectConfig = it.copy()
@@ -564,11 +565,9 @@ class BuildViewModel(private val app: Application, private var source: String) :
     }
 
 
-    fun buildApk() {
-        CoroutineScope(Dispatchers.Main).launch {
-            syncToProjectConfig()
-            doBuildingApk()
-        }
+    fun buildApk() = mainScope.launch {
+        syncToProjectConfig()
+        doBuildingApk()
     }
 
     fun checkInputs(viewModel: BuildViewModel = this): Boolean {
@@ -628,15 +627,19 @@ class BuildViewModel(private val app: Application, private var source: String) :
             ApkBuilder.BuildState.PREPARE -> {
                 buildDialogText = app.getString(R.string.apk_builder_prepare)
             }
+
             ApkBuilder.BuildState.BUILD -> {
                 buildDialogText = app.getString(R.string.apk_builder_build)
             }
+
             ApkBuilder.BuildState.SIGN -> {
                 buildDialogText = app.getString(R.string.apk_builder_sign)
             }
+
             ApkBuilder.BuildState.CLEAN -> {
                 buildDialogText = app.getString(R.string.apk_builder_clean)
             }
+
             ApkBuilder.BuildState.FINISH -> {
                 isShowBuildDialog = false
             }
diff --git a/app/src/main/java/org/autojs/autojs/ui/build/ProjectConfigActivity.kt b/app/src/main/java/org/autojs/autojs/ui/build/ProjectConfigActivity.kt
index e326d553b..f4b992024 100644
--- a/app/src/main/java/org/autojs/autojs/ui/build/ProjectConfigActivity.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/build/ProjectConfigActivity.kt
@@ -17,7 +17,7 @@ import com.bumptech.glide.request.RequestOptions
 import com.google.android.material.textfield.TextInputLayout
 import com.stardust.autojs.project.ProjectConfig
 import com.stardust.autojs.project.ProjectConfig.Companion.configFileOfDir
-import com.stardust.autojs.project.ProjectConfig.Companion.fromProjectDirAsync
+import com.stardust.autojs.project.ProjectConfig.Companion.fromProject
 import com.stardust.pio.PFiles.ensureDir
 import com.stardust.pio.PFiles.write
 import io.reactivex.Observable
@@ -98,7 +98,7 @@ open class ProjectConfigActivity : BaseActivity() {
             }
             mDirectory = File(dir)
             lifecycleScope.launch {
-                mProjectConfig = fromProjectDirAsync(dir)
+                mProjectConfig = fromProject(mDirectory!!)
                 if (mProjectConfig == null) {
                     ThemeColorMaterialDialogBuilder(this@ProjectConfigActivity)
                         .title(R.string.text_invalid_project)
diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.kt b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.kt
index 90c58a06b..2ed723109 100644
--- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.kt
@@ -10,12 +10,13 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
 import com.stardust.autojs.project.ProjectConfig
-import com.stardust.autojs.project.ProjectConfig.Companion.fromProjectDirAsync
+import com.stardust.autojs.project.ProjectConfig.Companion.fromProject
 import com.stardust.autojs.project.ProjectLauncher
 import com.stardust.pio.PFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.autojs.autojs.autojs.AutoJs
 import org.autojs.autojs.model.explorer.ExplorerChangeEvent
 import org.autojs.autojs.model.explorer.Explorers
@@ -24,6 +25,7 @@ import org.autojs.autojs.ui.build.ProjectConfigActivity
 import org.autojs.autojs.ui.build.ProjectConfigActivity_
 import org.autojs.autoxjs.R
 import org.greenrobot.eventbus.Subscribe
+import java.io.File
 
 class ExplorerProjectToolbar : CardView {
     private var mProjectConfig: ProjectConfig? = null
@@ -57,7 +59,10 @@ class ExplorerProjectToolbar : CardView {
 
     fun setProject(dir: PFile) {
         CoroutineScope(Dispatchers.Main).launch {
-            mProjectConfig = fromProjectDirAsync(dir.path)
+            withContext(Dispatchers.IO){
+                mProjectConfig = fromProject(File(dir.path))
+            }
+
             if (mProjectConfig == null) {
                 visibility = GONE
                 return@launch
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
index 25648f17c..5be73d5cb 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
+++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
@@ -1,15 +1,12 @@
 package com.stardust.autojs.project
 
 import android.content.Context
-import android.graphics.Bitmap
 import androidx.annotation.Keep
 import com.google.gson.GsonBuilder
 import com.google.gson.annotations.SerializedName
 import com.stardust.app.GlobalAppContext
 import com.stardust.autojs.R
 import com.stardust.pio.PFiles
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.zip.CRC32
 
@@ -54,6 +51,10 @@ data class ProjectConfig(
         else File(this.projectDirectory, name).absolutePath
     }
 
+    fun toJson(): String {
+        return GSON.toJson(this)
+    }
+
     companion object {
 
         const val CONFIG_FILE_NAME = "project.json"
@@ -64,7 +65,7 @@ data class ProjectConfig(
             return if (!isValid(config)) null else config
         }
 
-        fun isValid(config: ProjectConfig): Boolean {
+        private fun isValid(config: ProjectConfig): Boolean {
             return with(config) {
                 !name.isNullOrBlank()
                         && !packageName.isNullOrEmpty()
@@ -82,77 +83,25 @@ data class ProjectConfig(
             }
         }
 
-        fun fromFile(path: String): ProjectConfig? {
-            return try {
-                fromJson(File(path).readText())
-            } catch (e: Exception) {
+        fun fromProject(path: File): ProjectConfig? {
+            val file = with(path) {
+                if (isFile) return@with this
+                if (isDirectory) return@with File(this, CONFIG_FILE_NAME)
                 null
             }
-        }
-
-        fun fromProjectDir(path: String): ProjectConfig? {
-            return fromFile(configFileOfDir(path))
-        }
-
-        fun fromProjectDir(path: String, configName: String): ProjectConfig? {
-            return fromFile(configFileOfDir(path, configName))
-        }
-
-        suspend fun fromAssetsAsync(context: Context, path: String): ProjectConfig? =
-            withContext(Dispatchers.IO) {
-                return@withContext try {
-                    fromJson(context.assets.open(path).reader().use { it.readText() })
-                } catch (e: Exception) {
-                    null
-                }
-            }
-
-        suspend fun fromFileAsync(path: String): ProjectConfig? = withContext(Dispatchers.IO) {
-            return@withContext try {
-                fromJson(File(path).readText())
-            } catch (e: Exception) {
+            return try {
+                file?.let { fromJson(it.readText()) }
+            } catch (_: Exception) {
                 null
             }
-        }
-
-        suspend fun fromProjectDirAsync(path: String): ProjectConfig? = withContext(Dispatchers.IO) {
-            return@withContext fromFile(configFileOfDir(path))
-        }
-
-        suspend fun fromProjectDirAsync(path: String, configName: String): ProjectConfig? =
-            withContext(Dispatchers.IO) {
-                return@withContext fromFile(configFileOfDir(path, configName))
-            }
 
-        fun configFileOfDir(projectDir: String): String {
-            return PFiles.join(projectDir, CONFIG_FILE_NAME)
         }
 
-        fun configFileOfDir(projectDir: String, configName: String): String {
+        fun configFileOfDir(projectDir: String, configName: String = CONFIG_FILE_NAME): String {
             return PFiles.join(projectDir, configName)
         }
 
     }
-
-    fun toJson(): String {
-        return GSON.toJson(this)
-    }
-
-    fun getScriptConfig(path: String): ScriptConfig {
-        val scriptConfig = scripts[path] ?: ScriptConfig()
-        if (features.isEmpty()) {
-            return scriptConfig
-        }
-        //
-        val features = ArrayList(scriptConfig.features)
-        for (feature in features) {
-            if (!this.features.contains(feature)) {
-                this.features.add(feature)
-            }
-        }
-        scriptConfig.features = features
-        return scriptConfig
-    }
 }
 
 @Keep
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.kt b/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.kt
index 5bd7d6e21..acd753869 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.kt
+++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.kt
@@ -9,7 +9,7 @@ import java.io.File
  * Modified by wilinz on 2022/5/23
  */
 class ProjectLauncher(private val mProjectDir: String) {
-    private val mProjectConfig: ProjectConfig = ProjectConfig.fromProjectDir(mProjectDir)!!
+    private val mProjectConfig: ProjectConfig = ProjectConfig.fromProject(File(mProjectDir))!!
     private val mMainScriptFile: File = File(mProjectDir, mProjectConfig.mainScript)
     fun launch(service: ScriptEngineService) {
         val config = ExecutionConfig()

From 7e4e3588608b20f0be6faca6b4caae0751e7fef5 Mon Sep 17 00:00:00 2001
From: aiselp <aiselpk@gmail.com>
Date: Fri, 15 Sep 2023 17:13:10 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/autojs/autojs/ui/build/BuildPage.kt   | 172 ++++++++----------
 .../autojs/autojs/ui/build/BuildViewModel.kt  |  81 ++++-----
 2 files changed, 116 insertions(+), 137 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt b/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt
index a8b27f13f..46cca2e5c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt
@@ -11,19 +11,52 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.shape.ZeroCornerSize
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Card
+import androidx.compose.material.Checkbox
+import androidx.compose.material.ContentAlpha
+import androidx.compose.material.Divider
+import androidx.compose.material.FabPosition
+import androidx.compose.material.FloatingActionButton
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.material.TextField
+import androidx.compose.material.TextFieldColors
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Done
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
@@ -47,7 +80,6 @@ import com.stardust.pio.PFile
 import com.stardust.pio.PFiles
 import com.stardust.util.IntentUtil
 import org.autojs.autojs.Pref
-import org.autojs.autoxjs.R
 import org.autojs.autojs.build.ApkKeyStore
 import org.autojs.autojs.build.ApkSigner
 import org.autojs.autojs.external.fileprovider.AppFileProvider
@@ -55,7 +87,9 @@ import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder
 import org.autojs.autojs.ui.compose.widget.ProgressDialog
 import org.autojs.autojs.ui.filechooser.FileChooserDialogBuilder
 import org.autojs.autojs.ui.shortcut.ShortcutIconSelectResult
+import org.autojs.autoxjs.R
 import java.io.File
+import kotlin.reflect.KMutableProperty0
 
 /**
  * @author wilinz
@@ -226,42 +260,18 @@ private fun PackagingOptionCard(
                 onValueChange = { model.abiList = it },
                 label = { Text(text = stringResource(id = R.string.text_abi)) }
             )
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredOpenCv,
-                    onCheckedChange = { model.isRequiredOpenCv = it })
-                Text(text = stringResource(id = R.string.text_required_opencv))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredMlKitOCR,
-                    onCheckedChange = { model.isRequiredMlKitOCR = it })
-                Text(text = stringResource(id = R.string.text_required_google_mlkit_ocr))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredPaddleOCR,
-                    onCheckedChange = { model.isRequiredPaddleOCR = it })
-                Text(text = stringResource(id = R.string.text_required_paddle_ocr))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredTesseractOCR,
-                    onCheckedChange = { model.isRequiredTesseractOCR = it })
-                Text(text = stringResource(id = R.string.text_required_tesseract_ocr))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequired7Zip,
-                    onCheckedChange = { model.isRequired7Zip = it })
-                Text(text = stringResource(id = R.string.text_required_7zip))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredDefaultOcrModelData,
-                    onCheckedChange = { model.isRequiredDefaultOcrModelData = it })
-                Text(text = stringResource(id = R.string.text_required_default_paddle_ocr_model))
+            val map = mapOf(
+                stringResource(id = R.string.text_required_opencv) to model::isRequiredOpenCv,
+                stringResource(id = R.string.text_required_google_mlkit_ocr) to model::isRequiredMlKitOCR,
+                stringResource(id = R.string.text_required_paddle_ocr) to model::isRequiredPaddleOCR,
+                stringResource(id = R.string.text_required_tesseract_ocr) to model::isRequiredTesseractOCR,
+                stringResource(id = R.string.text_required_7zip) to model::isRequired7Zip,
+                stringResource(id = R.string.text_required_default_paddle_ocr_model) to model::isRequiredDefaultOcrModelData,
+            )
+            for ((t, v) in map) {
+                CheckboxOption(v, t)
             }
+
             //目前必须为true
             /*Row(verticalAlignment = Alignment.CenterVertically) {
                 Checkbox(
@@ -273,6 +283,21 @@ private fun PackagingOptionCard(
     }
 }
 
+@Composable
+fun CheckboxOption(value: KMutableProperty0<Boolean>, name: String) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { value.set(!value.get()) },
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Checkbox(
+            checked = value.get(),
+            onCheckedChange = { value.set(it) })
+        Text(text = name)
+    }
+}
+
 @Composable
 private fun SignatureCard(
     model: BuildViewModel
@@ -311,7 +336,7 @@ private fun RunConfigCard(model: BuildViewModel) {
         }
     )
 
-    Card() {
+    Card {
         Column(
             Modifier
                 .fillMaxSize()
@@ -324,60 +349,21 @@ private fun RunConfigCard(model: BuildViewModel) {
                 label = { Text(text = stringResource(id = R.string.text_main_file_name)) },
             )
             Spacer(modifier = Modifier.height(8.dp))
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isHideLauncher,
-                    onCheckedChange = { model.isHideLauncher = it })
-                Text(text = stringResource(id = R.string.text_hideLaucher))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isStableMode,
-                    onCheckedChange = { model.isStableMode = it })
-                Text(text = stringResource(id = R.string.text_stable_mode))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isHideLogs,
-                    onCheckedChange = { model.isHideLogs = it })
-                Text(text = stringResource(id = R.string.text_hideLogs))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isVolumeUpControl,
-                    onCheckedChange = { model.isVolumeUpControl = it })
-                Text(text = stringResource(id = R.string.text_volumeUpcontrol))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredAccessibilityServices,
-                    onCheckedChange = { model.isRequiredAccessibilityServices = it })
-                Text(text = stringResource(id = R.string.text_required_accessibility_service))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isHideAccessibilityServices,
-                    onCheckedChange = { model.isHideAccessibilityServices = it })
-                Text(text = stringResource(id = R.string.text_hide_accessibility_services))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredBackgroundStart,
-                    onCheckedChange = { model.isRequiredBackgroundStart = it })
-                Text(text = stringResource(id = R.string.text_required_background_start))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.isRequiredDrawOverlay,
-                    onCheckedChange = { model.isRequiredDrawOverlay = it })
-                Text(text = stringResource(id = R.string.text_required_draw_overlay))
-            }
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Checkbox(
-                    checked = model.displaySplash,
-                    onCheckedChange = { model.displaySplash = it })
-                Text(text = stringResource(id = R.string.text_display_splash))
+            val map = mapOf(
+                stringResource(id = R.string.text_hideLaucher) to model::isHideLauncher,
+                stringResource(id = R.string.text_stable_mode) to model::isStableMode,
+                stringResource(id = R.string.text_hideLogs) to model::isHideLogs,
+                stringResource(id = R.string.text_volumeUpcontrol) to model::isVolumeUpControl,
+                stringResource(id = R.string.text_required_accessibility_service) to model::isRequiredAccessibilityServices,
+                stringResource(id = R.string.text_hide_accessibility_services) to model::isHideAccessibilityServices,
+                stringResource(id = R.string.text_required_background_start) to model::isRequiredBackgroundStart,
+                stringResource(id = R.string.text_required_draw_overlay) to model::isRequiredDrawOverlay,
+                stringResource(id = R.string.text_display_splash) to model::displaySplash
+            )
+            for ((t, v) in map) {
+                CheckboxOption(v, t)
             }
+
             MyTextField(
                 value = model.splashText,
                 onValueChange = { model.splashText = it },
diff --git a/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt b/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
index 9175d72d6..fbd759367 100644
--- a/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
@@ -253,8 +253,8 @@ class BuildViewModel(private val app: Application, private var source: String) :
             projectDirectory = directory!!
             outputPath = viewModel.outputPath
             assets = updateAssets(assets)
-            libs = updateLibs(libs).toMutableList()
-            abis = updateAbiList(abis).toMutableList()
+            updateLibs(libs)
+            updateAbiList(abis)
             if (ignoredDirs.isEmpty()) ignoredDirs = listOf(buildDir)
             name = viewModel.appName
             versionCode = viewModel.versionCode.toInt()
@@ -271,7 +271,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
                 splashText = viewModel.splashText
                 splashIcon = viewModel.splashIcon?.toRelativePathOrString()
                 serviceDesc = viewModel.serviceDesc
-                permissions = updatePermissions(permissions)
+                permissions = updatePermissions()
                 isHideAccessibilityServices = viewModel.isHideAccessibilityServices
             }
             signingConfig.apply {
@@ -345,15 +345,6 @@ class BuildViewModel(private val app: Application, private var source: String) :
                 )
             )
         }
-//        if (customOcrModelPath.isNotBlank()) {
-//            val dirName = File(customOcrModelPath).name
-//            assetsList.add(
-//                Asset(
-//                    form = customOcrModelPath,
-//                    to = "/${Constant.Assets.OCR_MODELS}/$dirName"
-//                )
-//            )
-//        }
         if (!isSingleFile) {
             assetsList.addIfNotExist(
                 Asset(
@@ -365,28 +356,29 @@ class BuildViewModel(private val app: Application, private var source: String) :
         return assetsList.distinct()
     }
 
-    private fun updateAbiList(oldAbis: List<String>): List<String> {
-        val newAbis = abiList.split(",").map { it.trim() }
-        return oldAbis.toMutableList().apply { addAllIfNotExist(newAbis) }.distinct()
+    private fun updateAbiList(aLibs: MutableList<String>) {
+        aLibs.clear()
+        abiList.split(",").forEach {
+            aLibs.add(it.trim())
+        }
     }
 
-    private fun updateLibs(oldLibs: List<String>): List<String> {
-        val libList = oldLibs.toMutableList()
-        if (isRequiredOpenCv) libList.addAllIfNotExist(Constant.Libraries.OPEN_CV)
-        if (isRequiredPaddleOCR) libList.addAllIfNotExist(Constant.Libraries.PADDLE_OCR)
-        if (isRequiredMlKitOCR) libList.addAllIfNotExist(Constant.Libraries.GOOGLE_ML_KIT_OCR)
-        if (isRequiredTesseractOCR) libList.addAllIfNotExist(Constant.Libraries.TESSERACT_OCR)
-        if (isRequired7Zip) libList.addAllIfNotExist(Constant.Libraries.P7ZIP)
-        if (isRequiredTerminalEmulator) libList.addAllIfNotExist(Constant.Libraries.TERMINAL_EMULATOR)
-        return libList.distinct()
+    private fun updateLibs(libs: MutableList<String>) {
+        libs.clear()
+        if (isRequiredOpenCv) libs.addAll(Constant.Libraries.OPEN_CV)
+        if (isRequiredPaddleOCR) libs.addAll(Constant.Libraries.PADDLE_OCR)
+        if (isRequiredMlKitOCR) libs.addAll(Constant.Libraries.GOOGLE_ML_KIT_OCR)
+        if (isRequiredTesseractOCR) libs.addAll(Constant.Libraries.TESSERACT_OCR)
+        if (isRequired7Zip) libs.addAll(Constant.Libraries.P7ZIP)
+        if (isRequiredTerminalEmulator) libs.addAll(Constant.Libraries.TERMINAL_EMULATOR)
     }
 
-    private fun updatePermissions(oldPermissions: List<String>): List<String> {
-        val permissionList = oldPermissions.toMutableList()
-        if (isRequiredAccessibilityServices) permissionList.addIfNotExist(Constant.Permissions.ACCESSIBILITY_SERVICES)
-        if (isRequiredBackgroundStart) permissionList.addIfNotExist(Constant.Permissions.BACKGROUND_START)
-        if (isRequiredDrawOverlay) permissionList.addIfNotExist(Constant.Permissions.DRAW_OVERLAY)
-        return permissionList.distinct()
+    private fun updatePermissions(): List<String> {
+        val permissionList = ArrayList<String>()
+        if (isRequiredAccessibilityServices) permissionList.add(Constant.Permissions.ACCESSIBILITY_SERVICES)
+        if (isRequiredBackgroundStart) permissionList.add(Constant.Permissions.BACKGROUND_START)
+        if (isRequiredDrawOverlay) permissionList.add(Constant.Permissions.DRAW_OVERLAY)
+        return permissionList
     }
 
 
@@ -410,15 +402,11 @@ class BuildViewModel(private val app: Application, private var source: String) :
         var isRequiredMlKitOCRLibs = false
         var isRequiredMlKitOCRModels = false
         projectConfig.libs.let {
-            when {
-                it.containsAll(Constant.Libraries.GOOGLE_ML_KIT_OCR) -> isRequiredMlKitOCRLibs =
-                    true
-
-                it.containsAll(Constant.Libraries.PADDLE_OCR) -> isRequiredPaddleOCR = true
-                it.containsAll(Constant.Libraries.TESSERACT_OCR) -> isRequiredTesseractOCR = true
-                it.containsAll(Constant.Libraries.P7ZIP) -> isRequired7Zip = true
-                it.containsAll(Constant.Libraries.OPEN_CV) -> isRequiredOpenCv = true
-            }
+            isRequiredMlKitOCRLibs = it.containsAll(Constant.Libraries.GOOGLE_ML_KIT_OCR)
+            isRequiredPaddleOCR = it.containsAll(Constant.Libraries.PADDLE_OCR)
+            isRequiredTesseractOCR = it.containsAll(Constant.Libraries.TESSERACT_OCR)
+            isRequired7Zip = it.containsAll(Constant.Libraries.P7ZIP)
+            isRequiredOpenCv = it.containsAll(Constant.Libraries.OPEN_CV)
         }
         projectConfig.assets.forEach {
             if (it.form == "${Constant.Protocol.ASSETS}${Constant.Assets.GOOGLE_ML_KIT_OCR}") {
@@ -428,18 +416,23 @@ class BuildViewModel(private val app: Application, private var source: String) :
                 isRequiredDefaultOcrModelData = true
             }
         }
-
         isRequiredMlKitOCR = isRequiredMlKitOCRLibs && isRequiredMlKitOCRModels
     }
 
     private fun setPermissions(projectConfig: ProjectConfig) {
         projectConfig.launchConfig.permissions.forEach {
             when (it) {
-                Constant.Permissions.ACCESSIBILITY_SERVICES -> isRequiredAccessibilityServices =
-                    true
+                Constant.Permissions.ACCESSIBILITY_SERVICES -> {
+                    isRequiredAccessibilityServices = true
+                }
 
-                Constant.Permissions.BACKGROUND_START -> isRequiredBackgroundStart = true
-                Constant.Permissions.DRAW_OVERLAY -> isRequiredDrawOverlay = true
+                Constant.Permissions.BACKGROUND_START -> {
+                    isRequiredBackgroundStart = true
+                }
+
+                Constant.Permissions.DRAW_OVERLAY -> {
+                    isRequiredDrawOverlay = true
+                }
             }
         }
     }

From 87ec946386c5d8383e34c4073a78eec375ae3d58 Mon Sep 17 00:00:00 2001
From: aiselp <aiselpk@gmail.com>
Date: Fri, 15 Sep 2023 18:30:37 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/autojs/autojs/build/ApkBuilder.kt    |  9 +++++++--
 .../java/org/autojs/autojs/ui/build/BuildPage.kt  | 15 ++++++++++++++-
 .../org/autojs/autojs/ui/build/BuildViewModel.kt  |  3 +++
 app/src/main/res-i18n/values/strings.xml          |  2 ++
 .../com/stardust/autojs/project/ProjectConfig.kt  |  9 ++-------
 .../com/stardust/auojs/inrt/SplashActivity.kt     | 15 ++++++++++-----
 .../auojs/inrt/launch/AssetsProjectLauncher.kt    |  2 +-
 7 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/build/ApkBuilder.kt b/app/src/main/java/org/autojs/autojs/build/ApkBuilder.kt
index 7fa3df460..112ac8086 100644
--- a/app/src/main/java/org/autojs/autojs/build/ApkBuilder.kt
+++ b/app/src/main/java/org/autojs/autojs/build/ApkBuilder.kt
@@ -6,6 +6,7 @@ import com.stardust.app.GlobalAppContext
 import com.stardust.autojs.apkbuilder.ApkPackager
 import com.stardust.autojs.apkbuilder.ManifestEditor
 import com.stardust.autojs.project.BuildInfo
+import com.stardust.autojs.project.Constant
 import com.stardust.autojs.project.ProjectConfig
 import com.stardust.autojs.script.EncryptedScriptFileHeader
 import com.stardust.autojs.script.JavaScriptFileSource
@@ -16,11 +17,10 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
+import org.autojs.autojs.tool.addAllIfNotExist
 import org.autojs.autojs.tool.copyTo
 import org.autojs.autojs.tool.parseUriOrNull
 import org.autojs.autojs.tool.unzip
-import com.stardust.autojs.project.Constant
-import org.autojs.autojs.tool.addAllIfNotExist
 import pxb.android.StringItem
 import pxb.android.axml.AxmlWriter
 import zhao.arsceditor.ArscUtil
@@ -141,6 +141,11 @@ class ApkBuilder(
     }
 
     private fun encrypt(file: File, newFile: File) {
+        if (!projectConfig!!.isEncrypt){
+            newFile.delete()
+            file.copyTo(newFile)
+            return
+        }
         val out = newFile.outputStream()
         EncryptedScriptFileHeader.writeHeader(
             out,
diff --git a/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt b/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt
index 46cca2e5c..e932c2032 100644
--- a/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/build/BuildPage.kt
@@ -154,6 +154,7 @@ fun BuildPage(model: BuildViewModel = viewModel()) {
             ConfigCard(model)
             PackagingOptionCard(model)
             RunConfigCard(model)
+            EncryptCard(model)
             SignatureCard(model)
         }
     }
@@ -325,7 +326,19 @@ private fun SignatureCard(
         }
     }
 }
-
+@Composable
+fun EncryptCard(model: BuildViewModel){
+    Card {
+        Column(
+            Modifier
+                .fillMaxSize()
+                .padding(24.dp)
+        ){
+            Text(text = stringResource(R.string.text_encrypt_options))
+            CheckboxOption(model::isEncrypt, stringResource(id = R.string.text_is_encrypt))
+        }
+    }
+}
 @Composable
 private fun RunConfigCard(model: BuildViewModel) {
     val context = LocalContext.current
diff --git a/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt b/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
index fbd759367..425777081 100644
--- a/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/build/BuildViewModel.kt
@@ -133,6 +133,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
     var appSignKeyPath by mutableStateOf<String?>(null)
     var keyStore by mutableStateOf<ApkKeyStore?>(null)
 
+    var isEncrypt by mutableStateOf(false)
 
     val isConfigurationHasChanged: Boolean
         get() {
@@ -253,6 +254,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
             projectDirectory = directory!!
             outputPath = viewModel.outputPath
             assets = updateAssets(assets)
+            isEncrypt = viewModel.isEncrypt
             updateLibs(libs)
             updateAbiList(abis)
             if (ignoredDirs.isEmpty()) ignoredDirs = listOf(buildDir)
@@ -292,6 +294,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
         icon = projectConfig.icon?.let {
             getUri(it)
         }
+        isEncrypt = projectConfig.isEncrypt
         mainScriptFile = projectConfig.mainScript ?: getMainScriptName()
         isStableMode = projectConfig.launchConfig.isStableMode
         displaySplash = projectConfig.launchConfig.displaySplash
diff --git a/app/src/main/res-i18n/values/strings.xml b/app/src/main/res-i18n/values/strings.xml
index 132b46f21..c8944ecfa 100644
--- a/app/src/main/res-i18n/values/strings.xml
+++ b/app/src/main/res-i18n/values/strings.xml
@@ -266,6 +266,8 @@
     <string name="text_required_tesseract_ocr" translatable="false">TesseractOCR</string>
     <string name="text_required_7zip" translatable="false">7zip</string>
     <string name="text_required_terminal_emulator">终端模拟器</string>
+    <string name="text_is_encrypt">简单加密js文件</string>
+    <string name="text_encrypt_options">加密选项</string>
     <string name="text_required_background_start">需要后台弹出界面权限</string>
     <string name="text_required_draw_overlay">需要悬浮窗权限</string>
     <string name="text_volumeUpcontrol">音量上键结束任务</string>
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
index 5be73d5cb..08b1e55fb 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
+++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.kt
@@ -15,23 +15,16 @@ import java.util.zip.CRC32
  */
 @Keep
 data class ProjectConfig(
-    @SerializedName("name")
     var name: String? = null,
-    @SerializedName("packageName")
     var packageName: String? = null,
-    @SerializedName("versionCode")
     var versionCode: Int = 1,
-    @SerializedName("versionName")
     var versionName: String = "1.0.0",
-    @SerializedName("icon")
     var icon: String? = null,
     @SerializedName("main")
     var mainScript: String? = null,
-    @SerializedName("scripts")
     var scripts: Map<String, ScriptConfig> = HashMap(),
     @SerializedName("build")
     var buildInfo: BuildInfo = BuildInfo(),
-    @SerializedName("launchConfig")
     var launchConfig: LaunchConfig = LaunchConfig(),
     @SerializedName("useFeatures")
     var features: ArrayList<String> = arrayListOf(),
@@ -44,6 +37,8 @@ data class ProjectConfig(
     var abis: MutableList<String> = arrayListOf<String>().apply { addAll(Constant.Abi.abis) },
     var assets: List<Asset> = emptyList(),
     var signingConfig: SigningConfig = SigningConfig(),
+    @SerializedName("encrypt-code")
+    var isEncrypt:Boolean = false
 ) {
 
     fun getAbsolutePath(name: String): String {
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
index 4003253a5..093e2fba0 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
@@ -113,9 +113,11 @@ class SplashActivity : ComponentActivity() {
                         Permissions.ACCESSIBILITY_SERVICES -> {
                             requestAccessibilityService()
                         }
+
                         Permissions.BACKGROUND_START -> {
                             requestBackgroundStart()
                         }
+
                         Permissions.DRAW_OVERLAY -> {
                             requestDrawOverlays()
                         }
@@ -131,11 +133,12 @@ class SplashActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_splash)
         lifecycleScope.launch {
-            projectConfig =
-                ProjectConfig.fromAssetsAsync(
-                    this@SplashActivity,
-                    ProjectConfig.configFileOfDir("project")
-                )!!
+            projectConfig = withContext(Dispatchers.IO) {
+                    ProjectConfig.fromAssets(
+                        this@SplashActivity,
+                        ProjectConfig.configFileOfDir("project")
+                    )!!
+                }
             if (projectConfig.launchConfig.displaySplash) {
                 val frame = findViewById<FrameLayout>(R.id.frame)
                 frame.visibility = View.VISIBLE
@@ -188,10 +191,12 @@ class SplashActivity : ComponentActivity() {
                     permissionsResult[permission] =
                         AccessibilityServiceTool.isAccessibilityServiceEnabled(this)
                 }
+
                 Permissions.BACKGROUND_START -> {
                     permissionsResult[permission] =
                         BackgroundStartPermission.isBackgroundStartAllowed(this)
                 }
+
                 Permissions.DRAW_OVERLAY -> {
                     permissionsResult[permission] = DrawOverlaysPermission.isCanDrawOverlays(this)
                 }
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt
index 84fe16d35..71e2534ea 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt
@@ -96,7 +96,7 @@ open class AssetsProjectLauncher(
 
     private fun prepare() {
         val projectConfigPath = PFiles.join(mProjectDir, ProjectConfig.CONFIG_FILE_NAME)
-        val projectConfig = ProjectConfig.fromFile(projectConfigPath)
+        val projectConfig = ProjectConfig.fromProject(File(projectConfigPath))
         if (!BuildConfig.DEBUG && projectConfig != null &&
             TextUtils.equals(projectConfig.buildInfo.buildId, mProjectConfig.buildInfo.buildId)
         ) {