From ec7a0412af4c73084fc5ba0819c9ee250c5f2c6b Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Tue, 30 Jan 2018 11:00:45 +0800 Subject: [PATCH] fix: built apk showing unpacked script's path on console --- .../com/stardust/autojs/script/JavaScriptFileSource.java | 5 +++++ .../stardust/auojs/inrt/launch/AssetsProjectLauncher.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java index 5b521851..9459a131 100644 --- a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java +++ b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java @@ -18,6 +18,7 @@ public class JavaScriptFileSource extends JavaScriptSource { private File mFile; private String mScript; + private boolean mCustomsName = false; public JavaScriptFileSource(File file) { super(PFiles.getNameWithoutExtension(file.getName())); @@ -30,6 +31,7 @@ public class JavaScriptFileSource extends JavaScriptSource { public JavaScriptFileSource(String name, File file) { super(name); + mCustomsName = true; mFile = file; } @@ -56,6 +58,9 @@ public class JavaScriptFileSource extends JavaScriptSource { @Override public String toString() { + if (mCustomsName) { + return super.toString(); + } return mFile.toString(); } } diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java index fc4af538..e5b9543c 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java +++ b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java @@ -43,7 +43,7 @@ public class AssetsProjectLauncher { private void runScript() { try { - JavaScriptFileSource source = new JavaScriptFileSource(mMainScriptFile); + JavaScriptFileSource source = new JavaScriptFileSource("main", mMainScriptFile); AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig() .executePath(mProjectDir)); } catch (Exception e) {