diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java index 750ce697..5df892fc 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java @@ -93,6 +93,9 @@ public class JavaScriptHighlighter implements SimpleTextWatcher.AfterTextChanged } public void updateTokens(String sourceString) { + if(mTheme == null){ + return; + } final int id = mRunningHighlighterId.incrementAndGet(); mExecutorService.execute(() -> { try { diff --git a/autojs/src/main/assets/init.js b/autojs/src/main/assets/init.js index 74814858..7918ea99 100644 --- a/autojs/src/main/assets/init.js +++ b/autojs/src/main/assets/init.js @@ -31,7 +31,9 @@ runtime.init(); var len = functions.length; for(var i = 0; i < len; i++) { var funcName = functions[i]; - global[funcName] = obj[funcName].bind(obj); + if(obj[funcName]){ + global[funcName] = obj[funcName].bind(obj); + } } } diff --git a/autojs/src/main/assets/modules/__images__.js b/autojs/src/main/assets/modules/__images__.js index 7cebf282..ce45ad4c 100644 --- a/autojs/src/main/assets/modules/__images__.js +++ b/autojs/src/main/assets/modules/__images__.js @@ -2,7 +2,9 @@ module.exports = function (runtime, scope) { function images(){ } - util.__assignFunctions__(runtime.images, images, ['requestScreenCapture', 'captureScreen', 'read', 'copy', 'load', 'clip', 'pixel']) + if(android.os.Build.VERSION.SDK_INT >= 21){ + util.__assignFunctions__(runtime.images, images, ['requestScreenCapture', 'captureScreen', 'read', 'copy', 'load', 'clip', 'pixel']) + } images.opencvImporter = JavaImporter( org.opencv.core.Point, org.opencv.core.Point3,