diff --git a/app/release/output.json b/app/release/output.json index aaa06e73..fb70653f 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":34},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":242},"path":"release-3.0.0 Alpha42.apk","properties":{"packageId":"com.stardust.scriptdroid","split":"","minSdkVersion":"17"}}] \ 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 3b88ed4d..846edab0 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java @@ -37,7 +37,6 @@ import com.stardust.lang.ThreadCompat; import com.stardust.pio.UncheckedIOException; import com.stardust.util.ClipboardUtil; import com.stardust.autojs.core.util.ProcessShell; -import com.stardust.util.Objects; import com.stardust.util.ScreenMetrics; import com.stardust.util.SdkVersionUtil; import com.stardust.util.Supplier; @@ -45,7 +44,6 @@ import com.stardust.util.UiHandler; import com.stardust.view.accessibility.AccessibilityInfoProvider; import org.mozilla.javascript.ContextFactory; -import org.mozilla.javascript.RhinoException; import java.io.File; import java.io.IOException; @@ -197,7 +195,7 @@ public class ScriptRuntime { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { images = new Images(context, this, builder.mScreenCaptureRequester); } - engines = new Engines(builder.mEngineService); + engines = new Engines(builder.mEngineService, this); dialogs = new Dialogs(app, uiHandler, bridges); device = new Device(uiHandler.getContext()); floaty = new Floaty(uiHandler, ui, this); diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Engines.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Engines.java index 7b81a2c9..234e1f46 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Engines.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Engines.java @@ -1,10 +1,10 @@ package com.stardust.autojs.runtime.api; import com.stardust.autojs.ScriptEngineService; -import com.stardust.autojs.engine.JavaScriptEngine; import com.stardust.autojs.engine.ScriptEngine; import com.stardust.autojs.execution.ExecutionConfig; import com.stardust.autojs.execution.ScriptExecution; +import com.stardust.autojs.runtime.ScriptRuntime; import com.stardust.autojs.script.AutoFileSource; import com.stardust.autojs.script.JavaScriptFileSource; import com.stardust.autojs.script.JavaScriptSource; @@ -18,9 +18,11 @@ public class Engines { private ScriptEngineService mEngineService; private ScriptEngine mScriptEngine; + private ScriptRuntime mScriptRuntime; - public Engines(ScriptEngineService engineService) { + public Engines(ScriptEngineService engineService, ScriptRuntime scriptRuntime) { mEngineService = engineService; + mScriptRuntime = scriptRuntime; } public ScriptExecution execScript(String name, String script, ExecutionConfig config) { @@ -28,11 +30,11 @@ public class Engines { } public ScriptExecution execScriptFile(String path, ExecutionConfig config) { - return mEngineService.execute(new JavaScriptFileSource(path), config); + return mEngineService.execute(new JavaScriptFileSource(mScriptRuntime.files.path(path)), config); } public ScriptExecution execAutoFile(String path, ExecutionConfig config) { - return mEngineService.execute(new AutoFileSource(path), config); + return mEngineService.execute(new AutoFileSource(mScriptRuntime.files.path(path)), config); } public int stopAll() {