tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 被注释的代码

Browse Source
This commit is contained in:
hyb1996
2019-02-03 15:09:08 +08:00
parent 876e9235f6
commit 4d98ba515e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
View File

@@ -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));
}
}

15
autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
View File

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