From 94e9f5f34f3de9d3b86f8d25fee8c3419070b91c Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sat, 10 Nov 2018 16:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=9C=A8Android=204.4=E9=83=BD=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=BF=90=E8=A1=8C=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java   | 3 +++
 autojs/src/main/assets/init.js                                | 4 +++-
 autojs/src/main/assets/modules/__images__.js                  | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

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,