From 2b71f5e85690c1c354782764800baceca83776e9 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Fri, 19 Oct 2018 16:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20UiCollection.forEach?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E5=A4=8D=20=E9=83=A8=E5=88=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=97=A0=E6=B3=95=E6=89=BE=E5=9B=BE=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 --- app/src/main/java/org/autojs/autojs/App.java | 4 ++ .../main/java/com/stardust/autojs/AutoJs.java | 5 ++ .../autojs/core/image/OpenCVHelper.java | 1 + .../automator/UiObjectCollection.java | 50 +++++++++---------- common/release/output.json | 2 +- 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/autojs/autojs/App.java b/app/src/main/java/org/autojs/autojs/App.java index da2be8ae..6468b9be 100644 --- a/app/src/main/java/org/autojs/autojs/App.java +++ b/app/src/main/java/org/autojs/autojs/App.java @@ -14,6 +14,7 @@ import com.bumptech.glide.request.transition.Transition; import com.flurry.android.FlurryAgent; import com.squareup.leakcanary.LeakCanary; import com.stardust.app.GlobalAppContext; +import com.stardust.autojs.core.image.OpenCVHelper; import com.stardust.autojs.core.ui.inflater.ImageLoader; import com.stardust.autojs.core.ui.inflater.util.Drawables; import com.stardust.theme.ThemeColor; @@ -30,6 +31,8 @@ import org.autojs.autojs.timing.TimedTaskManager; import org.autojs.autojs.timing.TimedTaskScheduler; import org.autojs.autojs.tool.CrashHandler; import org.autojs.autojs.ui.error.ErrorReportActivity; +import org.opencv.android.BaseLoaderCallback; +import org.opencv.android.OpenCVLoader; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -107,6 +110,7 @@ public class App extends MultiDexApplication { setupDrawableImageLoader(); TimedTaskScheduler.checkTasksRepeatedlyIfNeeded(this); initDynamicBroadcastReceivers(); + } @SuppressLint("CheckResult") diff --git a/autojs/src/main/java/com/stardust/autojs/AutoJs.java b/autojs/src/main/java/com/stardust/autojs/AutoJs.java index 4669d431..25a75dc1 100644 --- a/autojs/src/main/java/com/stardust/autojs/AutoJs.java +++ b/autojs/src/main/java/com/stardust/autojs/AutoJs.java @@ -35,6 +35,8 @@ import com.stardust.view.accessibility.LayoutInspector; import org.mozilla.javascript.ContextFactory; import org.mozilla.javascript.Scriptable; +import org.opencv.android.BaseLoaderCallback; +import org.opencv.android.OpenCVLoader; import java.io.File; @@ -82,6 +84,9 @@ public abstract class AutoJs { protected void init() { addAccessibilityServiceDelegates(); registerActivityLifecycleCallbacks(); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_13, mContext, new BaseLoaderCallback(mContext) { + + }); } public abstract void ensureAccessibilityServiceEnabled(); diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java b/autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java index 06122a98..c1f5d725 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java +++ b/autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java @@ -45,6 +45,7 @@ public class OpenCVHelper { }); } + public static class LoaderCallback implements LoaderCallbackInterface { private Activity mActivity; diff --git a/automator/src/main/java/com/stardust/automator/UiObjectCollection.java b/automator/src/main/java/com/stardust/automator/UiObjectCollection.java index 8267603b..420ae882 100644 --- a/automator/src/main/java/com/stardust/automator/UiObjectCollection.java +++ b/automator/src/main/java/com/stardust/automator/UiObjectCollection.java @@ -55,7 +55,7 @@ import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat. * Created by Stardust on 2017/3/9. */ -public class UiObjectCollection implements List { +public class UiObjectCollection { public static final UiObjectCollection EMPTY = UiObjectCollection.of(Collections.emptyList()); @@ -73,59 +73,55 @@ public class UiObjectCollection implements List { return mNodes.toArray(new UiObject[0]); } - @Override public T[] toArray(T[] a) { return mNodes.toArray(a); } - @Override public boolean add(UiObject uiObject) { return mNodes.add(uiObject); } - @Override public boolean remove(Object o) { return mNodes.remove(o); } - @Override public boolean containsAll(Collection c) { return mNodes.containsAll(c); } - @Override + public boolean addAll(Collection c) { return mNodes.addAll(c); } - @Override + public boolean addAll(int index, Collection c) { return mNodes.addAll(index, c); } - @Override + public boolean removeAll(Collection c) { return mNodes.removeAll(c); } - @Override + public boolean retainAll(Collection c) { return mNodes.retainAll(c); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public void replaceAll(UnaryOperator operator) { mNodes.replaceAll(operator); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public void sort(Comparator c) { mNodes.sort(c); } - @Override + public void clear() { mNodes.clear(); } @@ -270,69 +266,69 @@ public class UiObjectCollection implements List { return mNodes.get(i); } - @Override + public UiObject set(int index, UiObject element) { return mNodes.set(index, element); } - @Override + public void add(int index, UiObject element) { mNodes.add(index, element); } - @Override + public UiObject remove(int index) { return mNodes.remove(index); } - @Override + public int indexOf(Object o) { return mNodes.indexOf(o); } - @Override + public int lastIndexOf(Object o) { return mNodes.lastIndexOf(o); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public ListIterator listIterator() { return mNodes.listIterator(); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public ListIterator listIterator(int index) { return mNodes.listIterator(index); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public List subList(int fromIndex, int toIndex) { return mNodes.subList(fromIndex, toIndex); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public Spliterator spliterator() { return mNodes.spliterator(); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public boolean removeIf(Predicate filter) { return mNodes.removeIf(filter); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public Stream stream() { return mNodes.stream(); } @RequiresApi(api = Build.VERSION_CODES.N) - @Override + public Stream parallelStream() { return mNodes.parallelStream(); } @@ -341,17 +337,17 @@ public class UiObjectCollection implements List { return mNodes.size(); } - @Override + public boolean isEmpty() { return mNodes.isEmpty(); } - @Override + public boolean contains(Object o) { return mNodes.contains(o); } - @Override + public Iterator iterator() { return mNodes.iterator(); } diff --git a/common/release/output.json b/common/release/output.json index fc934f52..7a758354 100644 --- a/common/release/output.json +++ b/common/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":433,"versionName":"4.0.4 Alpha4","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha4.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha4.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":434,"versionName":"4.0.4 Alpha5","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha5.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha5.apk","properties":{}}] \ No newline at end of file