From 198a6940647477c0d5bacd0b2c02461488156fb8 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 23 Feb 2018 22:42:53 +0800
Subject: [PATCH] fix: engines.execScriptFile() missing `executePath` config

---
 app/build.gradle                                           | 4 ++--
 .../stardust/scriptdroid/ui/edit/editor/CodeEditText.java  | 2 +-
 app/src/main/res/values/strings.xml                        | 2 +-
 autojs/src/main/assets/modules/__engines__.js              | 7 +++++--
 .../main/java/com/stardust/autojs/runtime/api/Engines.java | 2 ++
 common/src/main/java/com/stardust/util/DeveloperUtils.java | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49179cc2..020c41a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 252
-        versionName "3.1.0 Alpha2"
+        versionCode 253
+        versionName "3.1.0 Alpha3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditText.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditText.java
index 7743a362..8e653b3b 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditText.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditText.java
@@ -42,7 +42,7 @@ public class CodeEditText extends AppCompatEditText {
 
     static final String LOG_TAG = "CodeEditText";
     private static final boolean DEBUG = BuildConfig.DEBUG;
-    
+
     // 文字范围
     protected HVScrollView mParentScrollView;
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a15c0769..70f2bdb5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,5 +342,5 @@
     <string name="text_no_phone_state_permission">获取权限失败 :-(</string>
     <string name="text_request_permission">重新授予</string>
     <string name="info_no_phone_state_permission">软件需要显示启动页广告来维持服务器和软件的开发和维护，因此需要\"读取手机状态\"的权限。\n如果您不喜欢广告，可以在设置中设定广告每天只显示一次。</string>
-    <string name="dex_crcs">2399694286\n1797533891\n0</string>
+    <string name="dex_crcs">1805165984\n1603032210\no7Za8UoEvAoTVZPxJAqmQA==V8tiED7XGmzTkAGKbFPjLw==</string>
 </resources>
diff --git a/autojs/src/main/assets/modules/__engines__.js b/autojs/src/main/assets/modules/__engines__.js
index 5157f06f..feb637ae 100644
--- a/autojs/src/main/assets/modules/__engines__.js
+++ b/autojs/src/main/assets/modules/__engines__.js
@@ -26,11 +26,14 @@ module.exports = function(__runtime__, scope){
     function fillConfig(c){
         var config = new com.stardust.autojs.execution.ExecutionConfig();
         c = c || {};
+        c.path = c.path || files.cwd();
         if(c.path){
             if(typeof(c.path) == "string"){
-                config.path([c.path]);
+                config.requirePath([c.path]);
+                config.executePath(c.path);
             }else{
-                config.path(c.path);
+                config.requirePath(c.path);
+                config.executePath(c.path[0]);
             }
         }
         c.delay = c.delay || 0;
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 234e1f46..9dc07f7b 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
@@ -47,6 +47,8 @@ public class Engines {
 
 
     public void setCurrentEngine(ScriptEngine<JavaScriptSource> engine) {
+        if (mScriptEngine != null)
+            throw new IllegalStateException();
         mScriptEngine = engine;
     }
 
diff --git a/common/src/main/java/com/stardust/util/DeveloperUtils.java b/common/src/main/java/com/stardust/util/DeveloperUtils.java
index 1f162f5f..4e9e6db2 100644
--- a/common/src/main/java/com/stardust/util/DeveloperUtils.java
+++ b/common/src/main/java/com/stardust/util/DeveloperUtils.java
@@ -143,7 +143,7 @@ public class DeveloperUtils {
                 }
                 ZipEntry dexEntry = zipFile.getEntry(dexFile);
                 long dexEntryCrc = dexEntry.getCrc();
-                Log.d(LOG_TAG, String.valueOf(dexEntryCrc));
+                //Log.d(LOG_TAG, String.valueOf(dexEntryCrc));
                 if (dexEntryCrc != crc[i]) {
                     return false;
                 }