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) {