diff --git a/autojs/src/main/assets/modules/__java_util__.js b/autojs/src/main/assets/modules/__java_util__.js new file mode 100644 index 00000000..3a97e5d4 --- /dev/null +++ b/autojs/src/main/assets/modules/__java_util__.js @@ -0,0 +1,9 @@ +var J = {}; + +J.instanceOf = function(obj, clazz){ + return java.lang.Class.forName(clazz).isAssignableFrom(obj.getClass()); +} + + + +module.exports = J; \ No newline at end of file diff --git a/autojs/src/main/assets/modules/__ui__.js b/autojs/src/main/assets/modules/__ui__.js index 6d5e8583..f4bc4f93 100644 --- a/autojs/src/main/assets/modules/__ui__.js +++ b/autojs/src/main/assets/modules/__ui__.js @@ -3,6 +3,8 @@ module.exports = function (runtime, global) { require("object-observe-lite.min")(); require("array-observe.min")(); + var J = require("__java_util__"); + var ui = {}; ui.__view_cache__ = {}; @@ -234,16 +236,19 @@ module.exports = function (runtime, global) { event.consumed = false; emit("touch", event, view); return event.consumed; - }) - view.setOnLongClickListener(function (v) { - var event = {}; - event.consumed = false; - emit("long_click", event, view); - return event.consumed; - }); - view.setOnClickListener(function (v) { - emit("click", view); }); + if(!J.instanceOf(view, "android.widget.AdapterView")){ + view.setOnLongClickListener(function (v) { + var event = {}; + event.consumed = false; + emit("long_click", event, view); + return event.consumed; + }); + view.setOnClickListener(function (v) { + emit("click", view); + }); + } + view.setOnKeyListener(function (v, keyCode, event) { event = wrapMotionEvent(event); emit("key", keyCode, event, v); diff --git a/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java b/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java index 668ec32b..1ff74f45 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java +++ b/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java @@ -1,5 +1,7 @@ package com.stardust.autojs.core.http; +import android.widget.AdapterView; + import java.io.IOException; import java.util.Collections; import java.util.concurrent.TimeUnit;