From 16692dadf3d0207effc46986b1a895efdf6dcefe Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sat, 7 Apr 2018 14:03:14 +0800
Subject: [PATCH] fix(selector): UiObjectCollection.find() conflicts with
 Array.find()

---
 autojs/src/main/assets/init.js                |  4 ++--
 .../autojs/engine/RhinoJavaScriptEngine.java  | 21 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/autojs/src/main/assets/init.js b/autojs/src/main/assets/init.js
index 4d1630ea..26286f30 100644
--- a/autojs/src/main/assets/init.js
+++ b/autojs/src/main/assets/init.js
@@ -39,7 +39,7 @@ runtime.init();
                 arr.push(list.get(i));
             }
             for(var key in list){
-                if(arr[key])
+                if(typeof(key) == 'number')
                     continue;
                 var v = list[key];
                 if(typeof(v) == 'function'){
@@ -104,7 +104,7 @@ runtime.init();
     importClass(android.view.KeyEvent);
     importClass(com.stardust.autojs.core.util.Shell);
     importClass(android.graphics.Paint);
-    importClass(android.graphics.Canvas);
+    Canvas = com.stardust.autojs.core.graphics.ScriptCanvas;
 
     //重定向require以便支持相对路径
     (function(){
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
index b20c540a..70a8b59c 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
@@ -165,8 +165,6 @@ public class RhinoJavaScriptEngine extends JavaScriptEngine {
     private class WrapFactory extends org.mozilla.javascript.WrapFactory {
 
 
-        private ConcurrentHashMap<Class, NativeJavaClassWithPrototype> mJavaClasses = new ConcurrentHashMap<>();
-
         @Override
         public Object wrap(Context cx, Scriptable scope, Object obj, Class<?> staticType) {
             if (obj instanceof String) {
@@ -177,25 +175,6 @@ public class RhinoJavaScriptEngine extends JavaScriptEngine {
             }
             return super.wrap(cx, scope, obj, staticType);
         }
-
-        @Override
-        public Scriptable wrapAsJavaObject(Context cx, Scriptable scope, Object javaObject, Class<?> staticType) {
-            NativeJavaObjectWithPrototype obj = new NativeJavaObjectWithPrototype(scope, javaObject, staticType);
-            NativeJavaClassWithPrototype clazz = mJavaClasses.get(obj.getClass());
-            if (clazz == null) {
-                clazz = (NativeJavaClassWithPrototype) wrapJavaClass(cx, scope, obj.getClass());
-            }
-            obj.setPrototype(clazz);
-            return obj;
-        }
-
-
-        @Override
-        public Scriptable wrapJavaClass(Context cx, Scriptable scope, Class<?> javaClass) {
-            NativeJavaClassWithPrototype clazz = new NativeJavaClassWithPrototype(scope, javaClass);
-            mJavaClasses.put(javaClass, clazz);
-            return clazz;
-        }
     }
 
     private class InterruptibleAndroidContextFactory extends AndroidContextFactory {