diff --git a/app/build.gradle b/app/build.gradle index 0e0c4c82..c5054e93 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,7 @@ android { reset() // Specifies a list of ABIs that Gradle should create APKs for. - include "armeabi-v7a", "arm64-v8a", "x86", "x86_64" + include "x86", "x86_64", "armeabi-v7a", "arm64-v8a" // include "x86", "armeabi-v7a" // Specifies that we do not want to also generate a universal APK that includes all ABIs. diff --git a/autojs/src/main/java/com/stardust/autojs/core/looper/Timer.java b/autojs/src/main/java/com/stardust/autojs/core/looper/Timer.java index 469e0f11..ab0a63fd 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/looper/Timer.java +++ b/autojs/src/main/java/com/stardust/autojs/core/looper/Timer.java @@ -24,7 +24,7 @@ public class Timer { * SparseArray存在线程安全问题 改为ConcurrentHashMap */ private Map mHandlerCallbacks = new ConcurrentHashMap<>(); - private AtomicInteger mCallbackMaxId = new AtomicInteger(); + private AtomicInteger mCallbackMaxId = new AtomicInteger(1); private WeakReference mRuntime; private Handler mHandler; private long mMaxCallbackUptimeMillis = 0; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java b/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java index 7fd354fe..351fd3a4 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/ViewExtras.java @@ -78,6 +78,9 @@ public class ViewExtras { } public static void recycle(View view) { + if (view == null) { + return; + } ViewExtras extras; Object tag = view.getTag(R.id.view_tag_view_extras); if (tag instanceof ViewExtras) { diff --git a/build.gradle b/build.gradle index 79683d4e..bf70fe05 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,13 @@ buildscript { ext.kotlin_version = '1.6.10' ext.junit_version = '4.13.2' repositories { + mavenCentral() google() - jcenter() + maven { url "https://maven.aliyun.com/repository/central" } + maven { url "https://maven.aliyun.com/repository/google" } + maven { url "https://maven.aliyun.com/repository/gradle-plugin" } + maven { url "https://maven.aliyun.com/repository/jcenter" } + maven { url "https://maven.aliyun.com/repository/public" } } dependencies { classpath 'com.android.tools.build:gradle:7.0.4' @@ -19,12 +24,15 @@ buildscript { allprojects { repositories { - jcenter() - maven { - url "https://jitpack.io" - } + mavenCentral() google() + maven { url "https://jitpack.io" } maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } + maven { url "https://maven.aliyun.com/repository/central" } + maven { url "https://maven.aliyun.com/repository/google" } + maven { url "https://maven.aliyun.com/repository/gradle-plugin" } + maven { url "https://maven.aliyun.com/repository/jcenter" } + maven { url "https://maven.aliyun.com/repository/public" } } } diff --git a/inrt/build.gradle b/inrt/build.gradle index c64bb851..449ff59a 100644 --- a/inrt/build.gradle +++ b/inrt/build.gradle @@ -40,7 +40,7 @@ android { reset() // Specifies a list of ABIs that Gradle should create APKs for. - include "armeabi-v7a", "arm64-v8a" + include "x86", "x86_64", "armeabi-v7a", "arm64-v8a" // Specifies that we do not want to also generate a universal APK that includes all ABIs. universalApk false