From 4d98ba515e3e3e05c6d88a6523d9e1c9fcfa4d70 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sun, 3 Feb 2019 15:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=A2=AB=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/main/community/CommunityFragment.java      |  4 ++--
 .../autojs/engine/RhinoJavaScriptEngine.kt        | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
index 989feb32..9e9bbee4 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
@@ -129,12 +129,12 @@ public class CommunityFragment extends ViewPagerFragment implements BackPressedH
     @Override
     public void onPageShow() {
         super.onPageShow();
-        //EventBus.getDefault().post(new VisibilityChange(true));
+        EventBus.getDefault().post(new VisibilityChange(true));
     }
 
     @Override
     public void onPageHide() {
         super.onPageHide();
-        //EventBus.getDefault().post(new VisibilityChange(false));
+        EventBus.getDefault().post(new VisibilityChange(false));
     }
 }
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 d8bdde59..0fd0bbc1 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
@@ -12,10 +12,7 @@ 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
-import org.mozilla.javascript.Scriptable
-import org.mozilla.javascript.ScriptableObject
+import org.mozilla.javascript.*
 import org.mozilla.javascript.commonjs.module.RequireBuilder
 import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider
 import java.io.File
@@ -112,7 +109,15 @@ open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Co
         thread = Thread.currentThread()
         ScriptableObject.putProperty(mScriptable, "__engine__", this)
         initRequireBuilder(context, mScriptable)
-        context.executeScriptWithContinuations(initScript, mScriptable)
+        try {
+            context.executeScriptWithContinuations(initScript, mScriptable)
+        } catch (e: IllegalArgumentException) {
+            if ("Script argument was not a script or was not created by interpreted mode " == e.message) {
+                initScript.exec(context, mScriptable)
+            } else {
+                throw e
+            }
+        }
     }
 
     internal fun initRequireBuilder(context: Context, scope: Scriptable) {