getItems() {
return mDialog.getItems();
diff --git a/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java b/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java
index c1a44a2b1..993721f71 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/util/Shell.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.os.Handler;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.util.Log;
import com.stardust.autojs.runtime.ScriptRuntime;
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
index b4d5f02d1..71832dbc6 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
@@ -1,7 +1,7 @@
package com.stardust.autojs.engine;
import android.content.Context;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.util.Log;
import com.stardust.autojs.core.util.ProcessShell;
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java
index 46312834b..8dd8bb06b 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java
@@ -13,17 +13,16 @@
/**
* Created by Stardust on 2017/4/2.
*
- *
* A ScriptEngine is created by {@link ScriptEngineManager#createEngine(String, int)} ()}, and then can be
- * used to execute script with {@link ScriptEngine#execute(ScriptSource)} in the **same** thread.
+ * used to execute script with {@link ScriptEngine#execute(ScriptSource)} in the same thread.
* When the execution finish successfully, the engine should be destroy in the thread that created it.
- *
+ *
* If you want to stop the engine in other threads, you should call {@link ScriptEngine#forceStop()}.
+ *
*/
public interface ScriptEngine {
-
String TAG_ENV_PATH = "env_path";
String TAG_SOURCE = "source";
String TAG_WORKING_DIRECTORY = "execute_path";
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt b/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt
index 3044be3bb..d6d3168d5 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt
+++ b/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt
@@ -8,13 +8,15 @@ import java.util.*
/**
* Created by Stardust on 2017/2/1.
*/
-data class ExecutionConfig(var workingDirectory: String = "",
- var path: Array = emptyArray(),
- var intentFlags: Int = 0,
- var delay: Long = 0,
- var interval: Long = 0,
- var loopTimes: Int = 1,
- var scriptConfig: ScriptConfig = ScriptConfig()) : Parcelable {
+data class ExecutionConfig(
+ var workingDirectory: String = "",
+ var path: Array = emptyArray(),
+ var intentFlags: Int = 0,
+ var delay: Long = 0,
+ var interval: Long = 0,
+ var loopTimes: Int = 1,
+ var scriptConfig: ScriptConfig = ScriptConfig()
+) : Parcelable {
private val mArguments = HashMap()
@@ -23,12 +25,13 @@ data class ExecutionConfig(var workingDirectory: String = "",
get() = mArguments
constructor(parcel: Parcel) : this(
- parcel.readString().orEmpty(),
- parcel.createStringArray().orEmpty(),
- parcel.readInt(),
- parcel.readLong(),
- parcel.readLong(),
- parcel.readInt())
+ parcel.readString().orEmpty(),
+ parcel.createStringArray().orEmpty(),
+ parcel.readInt(),
+ parcel.readLong(),
+ parcel.readLong(),
+ parcel.readInt()
+ )
fun setArgument(key: String, `object`: Any) {
mArguments[key] = `object`
@@ -38,6 +41,10 @@ data class ExecutionConfig(var workingDirectory: String = "",
return mArguments[key]
}
+ fun getArguments(): Any {
+ return mArguments
+ }
+
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
index f1124e631..e189f645e 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
@@ -6,7 +6,7 @@
import com.stardust.pio.PFiles;
import com.stardust.util.MD5;
-import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.exception.ZipException;
import net.lingala.zip4j.model.FileHeader;
import net.lingala.zip4j.model.ZipParameters;
@@ -17,7 +17,6 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
@@ -29,14 +28,13 @@
public class AndroidClassLoader extends ClassLoader implements GeneratedClassLoader {
-
private static final String LOG_TAG = "AndroidClassLoader";
private final ClassLoader parent;
private final List mDexClassLoaders = new ArrayList<>();
private final File mCacheDir;
/**
- * Create a new instance with the given parent classloader and cache dierctory
+ * Create a new instance with the given parent classloader and cache directory
*
* @param parent the parent
* @param dir the cache directory
@@ -47,7 +45,9 @@ public AndroidClassLoader(ClassLoader parent, File dir) {
if (dir.exists()) {
PFiles.deleteFilesOfDir(dir);
} else {
- dir.mkdirs();
+ if (!dir.mkdirs()) {
+ Log.e(LOG_TAG, "dir.mkdirs() failed");
+ }
}
}
@@ -63,14 +63,15 @@ public Class defineClass(String name, byte[] data) {
final ZipFile zipFile = new ZipFile(classFile);
final ZipParameters parameters = new ZipParameters();
parameters.setFileNameInZip(name.replace('.', '/') + ".class");
- parameters.setSourceExternalStream(true);
zipFile.addStream(new ByteArrayInputStream(data), parameters);
return dexJar(classFile, null).loadClass(name);
- } catch (IOException | ZipException | ClassNotFoundException e) {
+ } catch (IOException | ClassNotFoundException e) {
throw new FatalLoadingException(e);
} finally {
if (classFile != null) {
- classFile.delete();
+ if (!classFile.delete()) {
+ Log.e(LOG_TAG, "classFile.delete() failed");
+ }
}
}
}
@@ -79,10 +80,14 @@ private File generateTempFile(String name, boolean create) throws IOException {
File file = new File(mCacheDir, name.hashCode() + System.currentTimeMillis() + ".jar");
if (create) {
if (!file.exists()) {
- file.createNewFile();
+ if (!file.createNewFile()) {
+ Log.e(LOG_TAG, "file.createNewFile() failed");
+ }
}
} else {
- file.delete();
+ if (!file.delete()) {
+ Log.e(LOG_TAG, "file.delete() failed");
+ }
}
return file;
}
@@ -101,17 +106,17 @@ public void loadJar(File jar) throws IOException {
final File classFile = generateTempFile(jar.getPath(), false);
final ZipFile zipFile = new ZipFile(classFile);
final ZipFile jarFile = new ZipFile(jar);
- //noinspection unchecked
- for (FileHeader header : (List) jarFile.getFileHeaders()) {
+ for (FileHeader header : jarFile.getFileHeaders()) {
if (!header.isDirectory()) {
final ZipParameters parameters = new ZipParameters();
parameters.setFileNameInZip(header.getFileName());
- parameters.setSourceExternalStream(true);
zipFile.addStream(jarFile.getInputStream(header), parameters);
}
}
dexJar(classFile, dexFile);
- classFile.delete();
+ if (!classFile.delete()) {
+ Log.e(LOG_TAG, "classFile.delete() failed");
+ }
} catch (ZipException e) {
throw new IOException(e);
}
@@ -144,7 +149,9 @@ private DexClassLoader dexJar(File classFile, File dexFile) throws IOException {
Main.run(arguments);
DexClassLoader loader = loadDex(dexFile);
if (isTmpDex) {
- dexFile.delete();
+ if (!dexFile.delete()) {
+ Log.e(LOG_TAG, "dexFile.delete() failed");
+ }
}
return loader;
}
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
index 302b34bf4..8acda87d5 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
@@ -215,9 +215,7 @@ protected ScriptRuntime(Builder builder) {
this.automator = new SimpleActionAutomator(accessibilityBridge, this);
automator.setScreenMetrics(mScreenMetrics);
this.info = accessibilityBridge.getInfoProvider();
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- images = new Images(context, this, builder.mScreenCaptureRequester);
- }
+ images = new Images(context, this, builder.mScreenCaptureRequester);
engines = new Engines(builder.mEngineService, this);
dialogs = new Dialogs(this);
device = new Device(context);
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
index 75d0ce72a..82ab36d3d 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
@@ -4,7 +4,6 @@
import android.content.Context;
import android.text.TextUtils;
import android.view.ContextThemeWrapper;
-import android.widget.CompoundButton;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
@@ -13,10 +12,8 @@
import com.stardust.autojs.annotation.ScriptVariable;
import com.stardust.autojs.core.ui.dialog.BlockedMaterialDialog;
import com.stardust.autojs.core.ui.dialog.JsDialogBuilder;
-import com.stardust.autojs.runtime.ScriptBridges;
import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.util.ArrayUtils;
-import com.stardust.util.UiHandler;
/**
* Created by Stardust on 2017/5/8.
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
index 8c5a4e968..0baede944 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
@@ -15,6 +15,7 @@
import androidx.annotation.RequiresApi;
import android.util.Base64;
+import android.util.Log;
import android.view.Gravity;
import com.stardust.autojs.annotation.ScriptVariable;
@@ -44,8 +45,6 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
/**
@@ -54,6 +53,8 @@
@RequiresApi(api = Build.VERSION_CODES.KITKAT)
public class Images {
+ private static final String TAG = Images.class.getSimpleName();
+
private ScriptRuntime mScriptRuntime;
private ScreenCaptureRequester mScreenCaptureRequester;
private ScreenCapturer mScreenCapturer;
@@ -348,21 +349,22 @@ public void initOpenCvIfNeeded() {
}
Activity currentActivity = mScriptRuntime.app.getCurrentActivity();
Context context = currentActivity == null ? mContext : currentActivity;
- mScriptRuntime.console.info("opencv initializing");
+ Log.i(TAG, "opencv: initializing");
if (Looper.myLooper() == Looper.getMainLooper()) {
- OpenCVHelper.initIfNeeded(context, () -> {
- mOpenCvInitialized = true;
- mScriptRuntime.console.info("opencv initialized");
- });
+ OpenCVHelper.initIfNeeded(context, this::initSuccessfully);
} else {
VolatileDispose result = new VolatileDispose<>();
OpenCVHelper.initIfNeeded(context, () -> {
- mOpenCvInitialized = true;
+ initSuccessfully();
result.setAndNotify(true);
- mScriptRuntime.console.info("opencv initialized");
});
result.blockedGet();
}
}
+
+ private void initSuccessfully() {
+ mOpenCvInitialized = true;
+ Log.i(TAG, "opencv: initialized");
+ }
}
diff --git a/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java b/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
index bcb675413..a3aeedada 100644
--- a/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
+++ b/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
@@ -5,14 +5,14 @@
import com.stardust.autojs.engine.RhinoJavaScriptEngine;
-import org.mozilla.javascript.jdk15.VMBridge_jdk15;
+import org.mozilla.javascript.jdk18.VMBridge_jdk18;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public class VMBridge_custom extends VMBridge_jdk15 {
+public class VMBridge_custom extends VMBridge_jdk18 {
private static final String LOG_TAG = "VMBridge_custom";
@@ -73,9 +73,9 @@ protected Object newInterfaceProxy(Object proxyHelper, ContextFactory cf, Interf
} catch (InvocationTargetException var10) {
throw Context.throwAsScriptRuntimeEx(var10);
} catch (IllegalAccessException var11) {
- throw Kit.initCause(new IllegalStateException(), var11);
+ throw new IllegalStateException(var11);
} catch (InstantiationException var12) {
- throw Kit.initCause(new IllegalStateException(), var12);
+ throw new IllegalStateException(var12);
}
}
diff --git a/automator/build.gradle b/automator/build.gradle
index 89a009f68..d166c37d6 100644
--- a/automator/build.gradle
+++ b/automator/build.gradle
@@ -1,23 +1,25 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_16
+ }
+}
android {
compileSdkVersion versions.compile
- buildToolsVersion versions.buildTool
defaultConfig {
minSdkVersion versions.mini
targetSdkVersion versions.target
- versionCode 1
- versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_16
+ targetCompatibility JavaVersion.VERSION_16
}
lintOptions {
abortOnError false
@@ -31,17 +33,11 @@ android {
}
repositories {
- flatDir {
- dirs 'libs'
- }
google()
}
dependencies {
- androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- testImplementation 'junit:junit:4.12'
- api 'androidx.appcompat:appcompat:1.0.2'
- api project(path: ':common')
+ testImplementation 'junit:junit:4.13.2'
+ api 'androidx.appcompat:appcompat:1.4.0'
+ api project(':common')
}
diff --git a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt
index 0d6fa4161..1ec6c91fb 100644
--- a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt
+++ b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt
@@ -117,18 +117,21 @@ class GlobalActionAutomator(private val mHandler: Handler?, private val serviceP
private fun gesturesWithoutHandler(description: GestureDescription): Boolean {
prepareLooperIfNeeded()
val result = VolatileBox(false)
- val handler = Handler(Looper.myLooper())
- service.dispatchGesture(description, object : AccessibilityService.GestureResultCallback() {
- override fun onCompleted(gestureDescription: GestureDescription) {
- result.set(true)
- quitLoop()
- }
-
- override fun onCancelled(gestureDescription: GestureDescription) {
- result.set(false)
- quitLoop()
- }
- }, handler)
+ val myLooper = Looper.myLooper()
+ if (myLooper != null) {
+ val handler = Handler(myLooper)
+ service.dispatchGesture(description, object : AccessibilityService.GestureResultCallback() {
+ override fun onCompleted(gestureDescription: GestureDescription) {
+ result.set(true)
+ quitLoop()
+ }
+
+ override fun onCancelled(gestureDescription: GestureDescription) {
+ result.set(false)
+ quitLoop()
+ }
+ }, handler)
+ }
Looper.loop()
return result.get()
}
diff --git a/automator/src/main/java/com/stardust/automator/search/BFS.kt b/automator/src/main/java/com/stardust/automator/search/BFS.kt
index 9f002b1f1..fed2b5edf 100644
--- a/automator/src/main/java/com/stardust/automator/search/BFS.kt
+++ b/automator/src/main/java/com/stardust/automator/search/BFS.kt
@@ -12,7 +12,7 @@ object BFS : SearchAlgorithm {
val queue = ArrayDeque()
queue.add(root)
while (!queue.isEmpty()) {
- val top = queue.poll()
+ val top = queue.poll()!!
val isTarget = filter.filter(top)
if (isTarget) {
result.add(top)
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/Able.kt b/automator/src/main/java/com/stardust/automator/simple_action/Able.kt
index 345a4523e..6303ed09e 100644
--- a/automator/src/main/java/com/stardust/automator/simple_action/Able.kt
+++ b/automator/src/main/java/com/stardust/automator/simple_action/Able.kt
@@ -16,28 +16,28 @@ interface Able {
val ABLE_MAP = SparseArrayEntries()
.entry(AccessibilityNodeInfo.ACTION_CLICK, object : Able {
- override fun isAble(nodeInfo: UiObject): Boolean {
- return nodeInfo.isClickable
+ override fun isAble(node: UiObject): Boolean {
+ return node.isClickable
}
})
.entry(AccessibilityNodeInfo.ACTION_LONG_CLICK, object : Able {
- override fun isAble(nodeInfo: UiObject): Boolean {
- return nodeInfo.isLongClickable
+ override fun isAble(node: UiObject): Boolean {
+ return node.isLongClickable
}
})
.entry(AccessibilityNodeInfo.ACTION_FOCUS, object : Able {
- override fun isAble(nodeInfo: UiObject): Boolean {
- return nodeInfo.isFocusable
+ override fun isAble(node: UiObject): Boolean {
+ return node.isFocusable
}
})
.entry(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, object : Able {
- override fun isAble(nodeInfo: UiObject): Boolean {
- return nodeInfo.isScrollable
+ override fun isAble(node: UiObject): Boolean {
+ return node.isScrollable
}
})
.entry(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, object : Able {
- override fun isAble(nodeInfo: UiObject): Boolean {
- return nodeInfo.isScrollable
+ override fun isAble(node: UiObject): Boolean {
+ return node.isScrollable
}
})
.sparseArray()
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt
index b02f091e5..a54002477 100644
--- a/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt
+++ b/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt
@@ -7,20 +7,20 @@ import com.stardust.automator.UiObject
* Created by Stardust on 2017/1/27.
*/
-class SearchUpTargetAction(action: Int, filter: FilterAction.Filter) : SearchTargetAction(action, filter) {
+class SearchUpTargetAction(action: Int, filter: Filter) : SearchTargetAction(action, filter) {
private val mAble: Able = Able.ABLE_MAP.get(action)
- override fun searchTarget(n: UiObject?): UiObject? {
- var node = n
+ override fun searchTarget(node: UiObject?): UiObject? {
+ var o = node
var i = 0
- while (node != null && !mAble.isAble(node)) {
+ while (o != null && !mAble.isAble(o)) {
i++
if (i > LOOP_MAX) {
return null
}
- node = node.parent()
+ o = o.parent()
}
- return node
+ return o
}
override fun toString(): String {
@@ -31,8 +31,6 @@ class SearchUpTargetAction(action: Int, filter: FilterAction.Filter) : SearchTar
}
companion object {
-
- private val TAG = SearchUpTargetAction::class.java!!.getSimpleName()
- private val LOOP_MAX = 20
+ private const val LOOP_MAX = 20
}
}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt
index fa3ede4f2..59c2876a0 100644
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt
@@ -83,8 +83,9 @@ open class AccessibilityNodeInfoAllocator {
try {
key.recycle()
notRecycledCount++
- if (DEBUG)
+ if (DEBUG && value !== null) {
Log.w(TAG, value)
+ }
} catch (ignored: IllegalStateException) {
}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt
index f1a05900a..0f2822446 100644
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt
@@ -1,10 +1,8 @@
package com.stardust.view.accessibility
import android.graphics.Rect
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import android.view.accessibility.AccessibilityNodeInfo
-
-import com.stardust.automator.UiObject
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
/**
* Created by Stardust on 2017/3/6.
@@ -20,6 +18,7 @@ object AccessibilityNodeInfoHelper {
* @param height pixel height of the display
* @return null if node is null, else a Rect containing visible bounds
*/
+ @Suppress("unused")
fun getVisibleBoundsInScreen(node: AccessibilityNodeInfo?, width: Int, height: Int): Rect? {
if (node == null) {
return null
@@ -33,7 +32,6 @@ object AccessibilityNodeInfoHelper {
displayRect.left = 0
displayRect.right = width
displayRect.bottom = height
- val intersect = nodeRect.intersect(displayRect)
return nodeRect
}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt
index 820cdf528..bf9dfb27a 100644
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt
@@ -1,6 +1,5 @@
package com.stardust.view.accessibility
-import android.accessibilityservice.*
import android.content.Context
import android.util.Log
import android.view.accessibility.AccessibilityEvent
@@ -8,7 +7,6 @@ import android.view.accessibility.AccessibilityEvent
import com.stardust.notification.Notification
import java.util.ArrayList
-import java.util.Collections
import java.util.concurrent.CopyOnWriteArrayList
/**
@@ -81,14 +79,14 @@ class AccessibilityNotificationObserver(private val mContext: Context) : Notific
return false
}
if (list != null) {
- onToast(event, Toast(event.packageName.toString(), list))
+ onToast(Toast(event.packageName.toString(), list))
}
}
return false
}
- private fun onToast(event: AccessibilityEvent, toast: Toast) {
+ private fun onToast(toast: Toast) {
for (listener in mToastListeners) {
try {
listener.onToast(toast)
diff --git a/build.gradle b/build.gradle
index a50fb89ef..365e3af6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,29 +1,50 @@
import groovy.json.JsonSlurper
+import org.apache.groovy.json.internal.LazyMap
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.3.10'
+ ext.kotlin_version = "1.6.0"
repositories {
+ mavenCentral()
google()
- jcenter()
+ maven { url "https://maven.aliyun.com/repository/apache-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/grails-core" }
+ maven { url "https://maven.aliyun.com/repository/jcenter" }
+ maven { url "https://maven.aliyun.com/repository/public" }
+ maven { url "https://maven.aliyun.com/repository/spring" }
+ maven { url "https://maven.aliyun.com/repository/spring-plugin" }
+ maven { url "https://repo.huaweicloud.com/repository/maven" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:7.2.0-alpha05'
+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2'
+ classpath "com.jakewharton:butterknife-gradle-plugin:10.2.1"
+ classpath "org.codehaus.groovy:groovy-json:3.0.8"
}
}
allprojects {
repositories {
- jcenter()
- maven {
- url "https://jitpack.io"
- }
+ maven { url "https://jitpack.io" }
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+ mavenCentral()
+ maven { url "https://maven.aliyun.com/repository/apache-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/grails-core" }
+ maven { url "https://maven.aliyun.com/repository/jcenter" }
+ maven { url "https://maven.aliyun.com/repository/public" }
+ maven { url "https://maven.aliyun.com/repository/spring" }
+ maven { url "https://maven.aliyun.com/repository/spring-plugin" }
+ maven { url "https://repo.huaweicloud.com/repository/maven" }
google()
- maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}
}
@@ -32,5 +53,5 @@ task clean(type: Delete) {
}
ext {
- versions = new JsonSlurper().parse(file('./project-versions.json'))
+ versions = new JsonSlurper().parse(file("./project-versions.json")) as LazyMap
}
diff --git a/common/build.gradle b/common/build.gradle
index d14f76396..eb7668ed4 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,21 +1,26 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
+tasks.withType(JavaCompile) {
+ options.compilerArgs << '-Xlint:deprecation'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_16
+ }
+}
android {
compileSdkVersion versions.compile
- buildToolsVersion versions.buildTool
defaultConfig {
minSdkVersion versions.mini
targetSdkVersion versions.target
- versionCode 1
- versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
-
buildTypes {
release {
minifyEnabled false
@@ -25,14 +30,15 @@ android {
lintOptions {
abortOnError false
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_16
+ targetCompatibility JavaVersion.VERSION_16
+ }
}
dependencies {
- androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- testImplementation 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13.2'
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- api 'androidx.annotation:annotation:1.0.0'
+ api 'androidx.annotation:annotation:1.3.0'
api 'com.github.hyb1996:settingscompat:1.1.5'
}
diff --git a/common/src/main/java/com/stardust/app/AppOps.kt b/common/src/main/java/com/stardust/app/AppOps.kt
index 40b7bb512..9fda65600 100644
--- a/common/src/main/java/com/stardust/app/AppOps.kt
+++ b/common/src/main/java/com/stardust/app/AppOps.kt
@@ -2,19 +2,29 @@ package com.stardust.app
import android.app.AppOpsManager
import android.content.Context
+import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager
import android.os.Build
import androidx.annotation.RequiresApi
-
@RequiresApi(Build.VERSION_CODES.KITKAT)
fun Context.isOpPermissionGranted(permission: String): Boolean {
- val appOps = getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
- val mode = appOps.checkOpNoThrow(permission, android.os.Process.myUid(), packageName)
-
- return if (mode == AppOpsManager.MODE_DEFAULT && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- checkCallingOrSelfPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) == PackageManager.PERMISSION_GRANTED
- } else {
+ return try {
+ val packageManager: PackageManager = this.packageManager
+ val applicationInfo: ApplicationInfo = packageManager.getApplicationInfo(this.packageName, 0)
+ val appOpsManager: AppOpsManager = this.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
+ val mode = if (Build.VERSION.SDK_INT >= 29 /* Build.VERSION_CODES.Q */) {
+ appOpsManager.unsafeCheckOpNoThrow(permission, applicationInfo.uid, applicationInfo.packageName)
+ } else {
+ @Suppress("DEPRECATION")
+ appOpsManager.checkOpNoThrow(permission, applicationInfo.uid, applicationInfo.packageName)
+ }
mode == AppOpsManager.MODE_ALLOWED
+ } catch (e: PackageManager.NameNotFoundException) {
+ false
}
+}
+
+fun Context.isUsageStatsPermissionGranted(): Boolean {
+ return this.isOpPermissionGranted(AppOpsManager.OPSTR_GET_USAGE_STATS)
}
\ No newline at end of file
diff --git a/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java b/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java
index 68412685c..3f2f9adb9 100644
--- a/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java
+++ b/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java
@@ -1,5 +1,6 @@
package com.stardust.app;
+import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
@@ -20,9 +21,9 @@ public interface OnFragmentInstantiateListener {
void OnInstantiate(int pos, Fragment fragment);
}
- private List mFragments = new ArrayList<>();
- private List mTitles = new ArrayList<>();
- private FragmentActivity mActivity;
+ private final List mFragments = new ArrayList<>();
+ private final List mTitles = new ArrayList<>();
+ private final FragmentActivity mActivity;
public FragmentPagerAdapterBuilder(FragmentActivity activity) {
mActivity = activity;
@@ -59,15 +60,16 @@ public CharSequence getPageTitle(int position) {
public abstract static class StoredFragmentPagerAdapter extends FragmentPagerAdapter {
- private SparseArray mStoredFragments = new SparseArray<>();
+ private final SparseArray mStoredFragments = new SparseArray<>();
private OnFragmentInstantiateListener mOnFragmentInstantiateListener;
public StoredFragmentPagerAdapter(FragmentManager fm) {
super(fm);
}
+ @NonNull
@Override
- public Object instantiateItem(ViewGroup container, int position) {
+ public Object instantiateItem(@NonNull ViewGroup container, int position) {
Fragment fragment = (Fragment) super.instantiateItem(container, position);
mStoredFragments.put(position, fragment);
if(mOnFragmentInstantiateListener != null){
@@ -78,7 +80,7 @@ public Object instantiateItem(ViewGroup container, int position) {
@Override
- public void destroyItem(ViewGroup container, int position, Object object) {
+ public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
mStoredFragments.remove(position);
super.destroyItem(container, position, object);
}
diff --git a/common/src/main/java/com/stardust/pio/PFiles.java b/common/src/main/java/com/stardust/pio/PFiles.java
index abb2fd0eb..90d28c202 100644
--- a/common/src/main/java/com/stardust/pio/PFiles.java
+++ b/common/src/main/java/com/stardust/pio/PFiles.java
@@ -1,11 +1,9 @@
package com.stardust.pio;
-import android.app.NativeActivity;
import android.content.Context;
import android.content.res.AssetManager;
import android.os.Environment;
import android.text.TextUtils;
-import android.util.Log;
import com.stardust.util.Func1;
@@ -14,15 +12,12 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.RandomAccessFile;
import java.nio.charset.Charset;
-import java.util.Arrays;
import java.util.Locale;
+import java.util.Objects;
/**
* Created by Stardust on 2017/4/1.
@@ -30,8 +25,6 @@
public class PFiles {
- private static final String TAG = "PFiles";
-
static final int DEFAULT_BUFFER_SIZE = 8192;
static final String DEFAULT_ENCODING = Charset.defaultCharset().name();
@@ -313,16 +306,8 @@ public static void copyAssetDir(AssetManager manager, String assetsDir, String t
String fullAssetsPath = join(assetsDir, file);
String[] children = manager.list(fullAssetsPath);
if (children == null || children.length == 0) {
- InputStream stream = null;
- try {
- stream = manager.open(fullAssetsPath);
+ try (InputStream stream = manager.open(fullAssetsPath)) {
copyStream(stream, join(toDir, file));
- } catch (IOException e) {
- throw e;
- } finally {
- if (stream != null) {
- stream.close();
- }
}
} else {
copyAssetDir(manager, fullAssetsPath, join(toDir, file), children);
@@ -460,12 +445,7 @@ private static String[] wrapNonNull(String[] list) {
public static String[] listDir(String path, final Func1 filter) {
final File file = new File(path);
- return wrapNonNull(file.list(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return filter.call(name);
- }
- }));
+ return wrapNonNull(file.list((dir, name) -> filter.call(name)));
}
public static boolean isFile(String path) {
@@ -478,7 +458,7 @@ public static boolean isDir(String path) {
public static boolean isEmptyDir(String path) {
File file = new File(path);
- return file.isDirectory() && file.list().length == 0;
+ return file.isDirectory() && Objects.requireNonNull(file.list()).length == 0;
}
public static String join(String base, String... paths) {
diff --git a/common/src/main/java/com/stardust/util/DeveloperUtils.java b/common/src/main/java/com/stardust/util/DeveloperUtils.java
index 7f01fd348..16d13b25d 100644
--- a/common/src/main/java/com/stardust/util/DeveloperUtils.java
+++ b/common/src/main/java/com/stardust/util/DeveloperUtils.java
@@ -11,6 +11,7 @@
import android.content.pm.Signature;
import androidx.annotation.Nullable;
import android.util.Base64;
+import android.util.Log;
import java.io.IOException;
import java.lang.ref.WeakReference;
@@ -19,6 +20,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import kotlin.text.Regex;
+
/**
* Created by Stardust on 2017/4/5.
*/
@@ -26,8 +29,7 @@
public class DeveloperUtils {
private static final String PACKAGE_NAME = "org.autojs.autojs";
- private static final String SIGNATURE = "nPNPcy4Lk/eP6fLvZitP0VPbHdFCbKua77m59vis5fA=";
- private static final String LOG_TAG = "DeveloperUtils";
+ private static final Regex SIGNATURE_REX = new Regex(".*(CbKua77m59vis|N7YkpKxKjsPWe).*");
private static final ExecutorService sExecutor = UnderuseExecutors.getExecutor();
private static final String SALT = "let\nlife\nbe\nbeautiful\nlike\nsummer\nflowers\nand\ndeath\nlike\nautumn\nleaves\n.";
@@ -80,7 +82,7 @@ public static boolean checkSignature(Context context, String packageName) {
if (sha.endsWith("\n")) {
sha = sha.substring(0, sha.length() - 1);
}
- return SIGNATURE.equals(sha);
+ return SIGNATURE_REX.matches(sha);
}
@@ -150,7 +152,7 @@ public static boolean checkDexFile(Context context, long[] crc) {
}
}
- public static void verifyApk(Activity activity, final int crcRes) {
+ public static void verifyApk(Activity activity) {
final WeakReference activityWeakReference = new WeakReference<>(activity);
sExecutor.execute(new Runnable() {
@Override
@@ -160,13 +162,7 @@ public void run() {
return;
if (!checkSignature(a)) {
a.finish();
- return;
}
- //long[] crc = readCrc(a.getString(crcRes));
- //if (!checkDexFile(a, crc)) {
- //a.finish();
- //}
-
}
});
}
diff --git a/common/src/main/java/com/stardust/util/ResourceMonitor.java b/common/src/main/java/com/stardust/util/ResourceMonitor.java
index c7a4fa861..760ee1ecd 100644
--- a/common/src/main/java/com/stardust/util/ResourceMonitor.java
+++ b/common/src/main/java/com/stardust/util/ResourceMonitor.java
@@ -8,13 +8,41 @@
import com.stardust.BuildConfig;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
public final class ResourceMonitor {
private static final String LOG_TAG = "ResourceMonitor";
- private static final ConcurrentHashMap, SparseArray> mResources = new ConcurrentHashMap<>();
+ // @Reference to TonyJiangWJ/Auto.js on Nov 22, 2021
+ private static class LockedResource {
+ private ReentrantLock lock;
+ private SparseArray resource;
+
+ public LockedResource() {
+ this.resource = new SparseArray<>();
+ this.lock = new ReentrantLock();
+ }
+
+ public ReentrantLock getLock() {
+ return lock;
+ }
+
+ public void setLock(ReentrantLock lock) {
+ this.lock = lock;
+ }
+
+ public SparseArray getResource() {
+ return resource;
+ }
+
+ public void setResource(SparseArray resource) {
+ this.resource = resource;
+ }
+ }
+
+ private static final ConcurrentHashMap, LockedResource> mResources = new ConcurrentHashMap<>();
private static Handler sHandler;
private static boolean sEnabled = BuildConfig.DEBUG;
private static ExceptionCreator sExceptionCreator;
@@ -32,9 +60,9 @@ public static void onOpen(ResourceMonitor.Resource resource) {
if (!sEnabled) {
return;
}
- SparseArray map = mResources.get(resource.getClass());
+ LockedResource map = mResources.get(resource.getClass());
if (map == null) {
- map = new SparseArray<>();
+ map = new LockedResource();
mResources.put(resource.getClass(), map);
}
int resourceId = resource.getResourceId();
@@ -45,16 +73,20 @@ public static void onOpen(ResourceMonitor.Resource resource) {
} else {
exception = sExceptionCreator.create(resource);
}
- map.put(resourceId, exception);
+ map.getLock().lock();
+ map.getResource().put(resourceId, exception);
+ map.getLock().unlock();
}
public static void onClose(ResourceMonitor.Resource resource) {
if (!sEnabled) {
return;
}
- SparseArray map = mResources.get(resource.getClass());
+ LockedResource map = mResources.get(resource.getClass());
if (map != null) {
- map.remove(resource.getResourceId());
+ map.getLock().lock();
+ map.getResource().remove(resource.getResourceId());
+ map.getLock().unlock();
}
}
@@ -62,12 +94,16 @@ public static void onFinalize(ResourceMonitor.Resource resource) {
if (!sEnabled) {
return;
}
- SparseArray map = mResources.get(resource.getClass());
+ LockedResource map = mResources.get(resource.getClass());
if (map != null) {
- int indexOfKey = map.indexOfKey(resource.getResourceId());
- if (indexOfKey >= 0) {
- final Exception exception = map.valueAt(indexOfKey);
- map.removeAt(indexOfKey);
+ map.getLock().lock();
+ int indexOfKey = map.getResource().indexOfKey(resource.getResourceId());
+ if (indexOfKey < 0) {
+ map.getLock().unlock();
+ } else {
+ final Exception exception = map.getResource().valueAt(indexOfKey);
+ map.getResource().removeAt(indexOfKey);
+ map.getLock().unlock();
if (sHandler == null) {
sHandler = new Handler(Looper.getMainLooper());
}
diff --git a/common/src/main/java/com/stardust/util/ViewUtil.java b/common/src/main/java/com/stardust/util/ViewUtil.java
index 61b58b547..ca419ee41 100644
--- a/common/src/main/java/com/stardust/util/ViewUtil.java
+++ b/common/src/main/java/com/stardust/util/ViewUtil.java
@@ -3,9 +3,15 @@
import android.app.Activity;
import android.content.Context;
import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+
+import android.content.ContextWrapper;
+import android.graphics.Rect;
import android.util.DisplayMetrics;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
+import android.view.Window;
/**
* Created by Stardust on 2017/1/24.
@@ -19,7 +25,7 @@ public class ViewUtil {
}
// FIXME: 2018/1/23 not working in some devices (https://github.com/hyb1996/Auto.js/issues/268)
- public static int getStatusBarHeight(Context context) {
+ public static int getStatusBarHeightLegacy(Context context) {
int result = 0;
int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
if (resourceId > 0) {
@@ -28,6 +34,36 @@ public static int getStatusBarHeight(Context context) {
return result;
}
+ public static int getStatusBarHeight(Context context) {
+ Rect rectangle = new Rect();
+ Window window = getWindowForContext(context);
+ if (window == null) {
+ return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, context.getResources().getDisplayMetrics());
+ }
+ window.getDecorView().getWindowVisibleDisplayFrame(rectangle);
+ return rectangle.top;
+ }
+
+ public static int getTitleBarHeight(Context context) {
+ Window window = getWindowForContext(context);
+ int contentViewTop = 0;
+ if (window != null) {
+ contentViewTop = window.findViewById(Window.ID_ANDROID_CONTENT).getTop();
+ }
+ return contentViewTop - getStatusBarHeight(context);
+ }
+
+ @Nullable
+ private static Window getWindowForContext(Context context) {
+ if (context instanceof Activity) {
+ return ((Activity) context).getWindow();
+ }
+ if (context instanceof ContextWrapper) {
+ return getWindowForContext(((ContextWrapper) context).getBaseContext());
+ }
+ return null;
+ }
+
public static int getScreenHeight(Activity activity) {
DisplayMetrics displayMetrics = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
diff --git a/gradle.properties b/gradle.properties
index 8204cd203..c317e0281 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,4 @@
-## Project-wide Gradle settings.
-#
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
@@ -12,11 +10,10 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-#Mon Jan 23 10:16:46 CST 2017
-#systemProp.https.proxyPort=1080
-#systemProp.http.proxyHost=127.0.0.1
-org.gradle.jvmargs=-Xms8192m -Xmx8192m -Dfile.encoding=UTF-8
-#systemProp.https.proxyHost=127.0.0.1
-#systemProp.http.proxyPort=1080
+#Thu Nov 11 16:38:18 CST 2021
+
+org.gradle.jvmargs=-Xms2g -Xmx2g -Dkotlin.daemon.jvm.options\="-Xmx2g" -Dfile.encoding\=UTF-8
+
android.useAndroidX=true
android.enableJetifier=true
+android.injected.studio.version.check=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 999ec9285..7f8f9af98 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 05 23:57:16 CST 2018
+#Fri Nov 26 16:35:39 CST 2021
distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
\ No newline at end of file
diff --git a/inrt/build.gradle b/inrt/build.gradle
index f8973cc38..dae35709c 100644
--- a/inrt/build.gradle
+++ b/inrt/build.gradle
@@ -1,16 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion versions.compile
- buildToolsVersion versions.buildTool
defaultConfig {
applicationId "com.stardust.auojs.inrt"
minSdkVersion versions.mini
targetSdkVersion versions.target
- versionCode versions.appVersionCode - 200
+ versionCode versions.appVersionCode
versionName versions.appVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
@@ -21,8 +19,8 @@ android {
disable 'ExtraTranslation'
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_16
+ targetCompatibility JavaVersion.VERSION_16
}
splits {
@@ -39,7 +37,7 @@ android {
reset()
// Specifies a list of ABIs that Gradle should create APKs for.
- include "x86", "armeabi-v7a"
+ include "armeabi-v7a"
// Specifies that we do not want to also generate a universal APK that includes all ABIs.
universalApk false
@@ -87,7 +85,6 @@ task buildApkPlugin {
return
}
buildApkPluginForAbi(pluginProjectDir, 'armeabi-v7a')
- buildApkPluginForAbi(pluginProjectDir, 'x86')
}
}
@@ -97,23 +94,24 @@ tasks.whenTaskAdded { task ->
}
}
-repositories {
- flatDir {
- dirs 'libs'
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_16
}
+}
+
+repositories {
google()
}
dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- //Glide
- implementation('com.github.bumptech.glide:glide:4.2.0', {
- exclude group: 'com.android.support'
- })
- testImplementation 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13.2'
+
+ implementation 'com.github.bumptech.glide:glide:4.12.0'
+
+ implementation project(":libs:org.mozilla.rhino-1.7.14")
+ implementation project(":libs:org.opencv-4.5.4")
+
implementation project(':automator')
implementation project(':common')
implementation project(':autojs')
diff --git a/inrt/libs/emulatorview-release.aar b/inrt/libs/emulatorview-release.aar
deleted file mode 100644
index 84e3e3343..000000000
Binary files a/inrt/libs/emulatorview-release.aar and /dev/null differ
diff --git a/inrt/libs/libtermexec-release.aar b/inrt/libs/libtermexec-release.aar
deleted file mode 100644
index f49ae3493..000000000
Binary files a/inrt/libs/libtermexec-release.aar and /dev/null differ
diff --git a/inrt/libs/opencv-3.4.3.aar b/inrt/libs/opencv-3.4.3.aar
deleted file mode 100644
index c0ffeb818..000000000
Binary files a/inrt/libs/opencv-3.4.3.aar and /dev/null differ
diff --git a/inrt/libs/term-debug.aar b/inrt/libs/term-debug.aar
deleted file mode 100644
index b32ad4322..000000000
Binary files a/inrt/libs/term-debug.aar and /dev/null differ
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/App.kt b/inrt/src/main/java/com/stardust/auojs/inrt/App.kt
index 64305346d..806da5e7c 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/App.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/App.kt
@@ -30,18 +30,18 @@ class App : Application() {
Drawables.setDefaultImageLoader(object : ImageLoader {
override fun loadInto(imageView: ImageView, uri: Uri) {
Glide.with(this@App)
- .load(uri)
- .into(imageView)
+ .load(uri)
+ .into(imageView)
}
override fun loadIntoBackground(view: View, uri: Uri) {
Glide.with(this@App)
- .load(uri)
- .into(object : SimpleTarget() {
- override fun onResourceReady(resource: Drawable, transition: Transition) {
- view.background = resource
- }
- })
+ .load(uri)
+ .into(object : SimpleTarget() {
+ override fun onResourceReady(resource: Drawable, transition: Transition?) {
+ view.background = resource
+ }
+ })
}
override fun load(view: View, uri: Uri): Drawable {
@@ -50,23 +50,23 @@ class App : Application() {
override fun load(view: View, uri: Uri, drawableCallback: ImageLoader.DrawableCallback) {
Glide.with(this@App)
- .load(uri)
- .into(object : SimpleTarget() {
- override fun onResourceReady(resource: Drawable, transition: Transition) {
- drawableCallback.onLoaded(resource)
- }
- })
+ .load(uri)
+ .into(object : SimpleTarget() {
+ override fun onResourceReady(resource: Drawable, transition: Transition?) {
+ drawableCallback.onLoaded(resource)
+ }
+ })
}
override fun load(view: View, uri: Uri, bitmapCallback: ImageLoader.BitmapCallback) {
Glide.with(this@App)
- .asBitmap()
- .load(uri)
- .into(object : SimpleTarget() {
- override fun onResourceReady(resource: Bitmap, transition: Transition) {
- bitmapCallback.onLoaded(resource)
- }
- })
+ .asBitmap()
+ .load(uri)
+ .into(object : SimpleTarget() {
+ override fun onResourceReady(resource: Bitmap, transition: Transition?) {
+ bitmapCallback.onLoaded(resource)
+ }
+ })
}
})
}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt b/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt
index e2e62a772..47010ea38 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt
@@ -1,7 +1,7 @@
package com.stardust.auojs.inrt
import android.content.SharedPreferences
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
import com.stardust.app.GlobalAppContext
@@ -14,13 +14,13 @@ object Pref {
private const val KEY_FIRST_USING = "key_first_using"
private var sPreferences: SharedPreferences? = null
- val preferences: SharedPreferences
+ private val preferences: SharedPreferences
get() {
- return sPreferences ?: {
+ return sPreferences ?: run {
val pref = PreferenceManager.getDefaultSharedPreferences(GlobalAppContext.get())
sPreferences = pref
pref
- }()
+ }
}
val isFirstUsing: Boolean
@@ -37,11 +37,11 @@ object Pref {
}
fun shouldEnableAccessibilityServiceByRoot(): Boolean {
- return preferences.getBoolean(getString(R.string.key_enable_accessibility_service_by_root), false)
+ return preferences.getBoolean(getString(R.string.key_enable_accessibility_service_by_root), true)
}
fun shouldHideLogs(): Boolean {
- return preferences.getBoolean(getString(R.string.key_dont_show_main_activity), false)
+ return preferences.getBoolean(getString(R.string.key_not_show_main_activity), false)
}
fun shouldStopAllScriptsWhenVolumeUp(): Boolean {
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt
index 02efc172e..d525a8777 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt
@@ -5,14 +5,11 @@ import androidx.annotation.Nullable
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
-
/**
* Created by Stardust on 2017/12/8.
*/
class SettingsActivity : AppCompatActivity() {
-
-
override fun onCreate(@Nullable savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setupViews()
@@ -28,11 +25,15 @@ class SettingsActivity : AppCompatActivity() {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
- class PreferenceFragment : android.preference.PreferenceFragment() {
+ class PreferenceFragment : androidx.preference.PreferenceFragment() {
override fun onCreate(@Nullable savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
addPreferencesFromResource(R.xml.preference)
}
+
+ override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+ TODO("Not yet implemented")
+ }
}
}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
index 5705cd2f2..0f4562702 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
@@ -53,7 +53,7 @@ class SplashActivity : AppCompatActivity() {
runOnUiThread {
Toast.makeText(this@SplashActivity, e.message, Toast.LENGTH_LONG).show()
startActivity(Intent(this@SplashActivity, LogActivity::class.java))
- AutoJs.instance!!.globalConsole.printAllStackTrace(e)
+ AutoJs.instance.globalConsole.printAllStackTrace(e)
}
}
}.start()
@@ -64,13 +64,9 @@ class SplashActivity : AppCompatActivity() {
}
private fun checkPermission(vararg permissions: String) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- val requestPermissions = getRequestPermissions(permissions)
- if (requestPermissions.isNotEmpty()) {
- requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE)
- } else {
- runScript()
- }
+ val requestPermissions = getRequestPermissions(permissions)
+ if (requestPermissions.isNotEmpty()) {
+ requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE)
} else {
runScript()
}
@@ -91,7 +87,7 @@ class SplashActivity : AppCompatActivity() {
companion object {
private const val PERMISSION_REQUEST_CODE = 11186
- private const val INIT_TIMEOUT: Long = 2500
+ private const val INIT_TIMEOUT: Long = 1000
}
}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt
index 975c24070..2666bbe0e 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt
@@ -22,7 +22,7 @@ class GlobalKeyObserver internal constructor() : OnKeyListener, ShellKeyObserver
init {
AccessibilityService.stickOnKeyObserver
- .addListener(this)
+ .addListener(this)
val observer = ShellKeyObserver()
observer.setKeyListener(this)
InputEventObserver.getGlobal(GlobalAppContext.get()).addListener(observer)
@@ -31,7 +31,7 @@ class GlobalKeyObserver internal constructor() : OnKeyListener, ShellKeyObserver
fun onVolumeUp() {
Log.d(LOG_TAG, "onVolumeUp at " + System.currentTimeMillis())
if (Pref.shouldStopAllScriptsWhenVolumeUp()) {
- AutoJs.instance!!.scriptEngineService.stopAllAndToast()
+ AutoJs.instance.scriptEngineService.stopAllAndToast()
}
}
@@ -83,9 +83,7 @@ class GlobalKeyObserver internal constructor() : OnKeyListener, ShellKeyObserver
}
companion object {
-
-
- private val LOG_TAG = "GlobalKeyObserver"
+ private const val LOG_TAG = "GlobalKeyObserver"
private val sSingleton = GlobalKeyObserver()
fun init() {
diff --git a/inrt/src/main/res/values/strings.xml b/inrt/src/main/res/values/strings.xml
index 59d0b15d5..0e6da3442 100644
--- a/inrt/src/main/res/values/strings.xml
+++ b/inrt/src/main/res/values/strings.xml
@@ -5,19 +5,18 @@
使用root权限启用无障碍服务失败
设置
脚本运行
-
key_use_volume_control_running
key_enable_accessibility_service_by_root
音量上键停止所有脚本
- 开启后运行脚本会使用Root权限自动开启无障碍服务
- 使用Root权限自动启用服务
+ 开启后运行脚本会使用 Root 权限自动开启无障碍服务
+ 使用 Root 权限自动启用服务
key_stable_mode
开启后布局分析更稳定，但小部分脚本可能无法正常运行。重启无障碍服务生效
稳定模式
无障碍服务
- 不显示主界面
- key_dont_show_main_activity
- 打开应用后直接运行脚本
+ 不显示主界面
+ key_not_show_main_activity
+ 打开应用后直接运行脚本
其他
Powered by Auto.js
\n------------\n[%s]运行结束，用时%f秒
diff --git a/inrt/src/main/res/xml/preference.xml b/inrt/src/main/res/xml/preference.xml
index eb132d913..8b0bd4d77 100644
--- a/inrt/src/main/res/xml/preference.xml
+++ b/inrt/src/main/res/xml/preference.xml
@@ -11,9 +11,9 @@
+ android:key="@string/key_not_show_main_activity"
+ android:summary="@string/summary_not_show_main_activity"
+ android:title="@string/text_not_show_main_activity"/>
diff --git a/libs/com.android.dx-1.7.0/build.gradle b/libs/com.android.dx-1.7.0/build.gradle
new file mode 100644
index 000000000..f5c271b60
--- /dev/null
+++ b/libs/com.android.dx-1.7.0/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("dx.jar"))
\ No newline at end of file
diff --git a/autojs/libs/dx.jar b/libs/com.android.dx-1.7.0/dx.jar
similarity index 100%
rename from autojs/libs/dx.jar
rename to libs/com.android.dx-1.7.0/dx.jar
diff --git a/libs/com.tencent.bugly.crashreport-2.6.6/build.gradle b/libs/com.tencent.bugly.crashreport-2.6.6/build.gradle
new file mode 100644
index 000000000..50395f95c
--- /dev/null
+++ b/libs/com.tencent.bugly.crashreport-2.6.6/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("crashreport-2.6.6.aar"))
\ No newline at end of file
diff --git a/libs/com.tencent.bugly.crashreport-2.6.6/crashreport-2.6.6.aar b/libs/com.tencent.bugly.crashreport-2.6.6/crashreport-2.6.6.aar
new file mode 100644
index 000000000..82a867320
Binary files /dev/null and b/libs/com.tencent.bugly.crashreport-2.6.6/crashreport-2.6.6.aar differ
diff --git a/libs/jackpal.androidterm-1.0.70/build.gradle b/libs/jackpal.androidterm-1.0.70/build.gradle
new file mode 100644
index 000000000..5269ce81e
--- /dev/null
+++ b/libs/jackpal.androidterm-1.0.70/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("term-debug.aar"))
\ No newline at end of file
diff --git a/app/libs/term-debug.aar b/libs/jackpal.androidterm-1.0.70/term-debug.aar
similarity index 100%
rename from app/libs/term-debug.aar
rename to libs/jackpal.androidterm-1.0.70/term-debug.aar
diff --git a/libs/jackpal.androidterm.emulatorview-1.0.42/build.gradle b/libs/jackpal.androidterm.emulatorview-1.0.42/build.gradle
new file mode 100644
index 000000000..204111152
--- /dev/null
+++ b/libs/jackpal.androidterm.emulatorview-1.0.42/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("emulatorview-release.aar"))
\ No newline at end of file
diff --git a/app/libs/emulatorview-release.aar b/libs/jackpal.androidterm.emulatorview-1.0.42/emulatorview-release.aar
similarity index 100%
rename from app/libs/emulatorview-release.aar
rename to libs/jackpal.androidterm.emulatorview-1.0.42/emulatorview-release.aar
diff --git a/libs/jackpal.androidterm.libtermexec-1.0/build.gradle b/libs/jackpal.androidterm.libtermexec-1.0/build.gradle
new file mode 100644
index 000000000..7273945ae
--- /dev/null
+++ b/libs/jackpal.androidterm.libtermexec-1.0/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("libtermexec-release.aar"))
\ No newline at end of file
diff --git a/app/libs/libtermexec-release.aar b/libs/jackpal.androidterm.libtermexec-1.0/libtermexec-release.aar
similarity index 100%
rename from app/libs/libtermexec-release.aar
rename to libs/jackpal.androidterm.libtermexec-1.0/libtermexec-release.aar
diff --git a/libs/org.mozilla.rhino-1.7.14/build.gradle b/libs/org.mozilla.rhino-1.7.14/build.gradle
new file mode 100644
index 000000000..984d52073
--- /dev/null
+++ b/libs/org.mozilla.rhino-1.7.14/build.gradle
@@ -0,0 +1,8 @@
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_16
+ }
+}
+
+configurations.maybeCreate("default")
+artifacts.add("default", file("rhino-1.7.14-SNAPSHOT.jar"))
\ No newline at end of file
diff --git a/libs/org.mozilla.rhino-1.7.14/rhino-1.7.14-SNAPSHOT.jar b/libs/org.mozilla.rhino-1.7.14/rhino-1.7.14-SNAPSHOT.jar
new file mode 100644
index 000000000..4968be500
Binary files /dev/null and b/libs/org.mozilla.rhino-1.7.14/rhino-1.7.14-SNAPSHOT.jar differ
diff --git a/libs/org.opencv-4.5.4/build.gradle b/libs/org.opencv-4.5.4/build.gradle
new file mode 100644
index 000000000..eb6c3887f
--- /dev/null
+++ b/libs/org.opencv-4.5.4/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file("opencv-4.5.4.aar"))
\ No newline at end of file
diff --git a/libs/org.opencv-4.5.4/opencv-4.5.4.aar b/libs/org.opencv-4.5.4/opencv-4.5.4.aar
new file mode 100644
index 000000000..69ed04a0d
Binary files /dev/null and b/libs/org.opencv-4.5.4/opencv-4.5.4.aar differ
diff --git a/project-versions.json b/project-versions.json
index ce36fa6c1..b1ba7f559 100644
--- a/project-versions.json
+++ b/project-versions.json
@@ -1,8 +1,8 @@
{
- "appVersionCode": 461,
- "appVersionName": "4.1.1 Alpha2",
+ "appVersionCode": 654,
+ "appVersionName": "6.0.0",
+ "appSinceDate": "Dec 1, 2021",
"target": 28,
- "mini": 17,
- "compile": 28,
- "buildTool": "28.0.3"
+ "mini": 24,
+ "compile": 31
}
\ No newline at end of file
diff --git a/screen-captures/ss01.png b/screen-captures/ss01.png
deleted file mode 100644
index b297a1259..000000000
Binary files a/screen-captures/ss01.png and /dev/null differ
diff --git a/screen-captures/ss02.png b/screen-captures/ss02.png
deleted file mode 100644
index be174c71e..000000000
Binary files a/screen-captures/ss02.png and /dev/null differ
diff --git a/screen-captures/ss03.png b/screen-captures/ss03.png
deleted file mode 100644
index 43597c5bc..000000000
Binary files a/screen-captures/ss03.png and /dev/null differ
diff --git a/screen-captures/ss04.png b/screen-captures/ss04.png
deleted file mode 100644
index 752ed2bf5..000000000
Binary files a/screen-captures/ss04.png and /dev/null differ
diff --git a/screen-captures/ss05.png b/screen-captures/ss05.png
deleted file mode 100644
index 660ef5eb9..000000000
Binary files a/screen-captures/ss05.png and /dev/null differ
diff --git a/screen-captures/ss06.png b/screen-captures/ss06.png
deleted file mode 100644
index f0c977b16..000000000
Binary files a/screen-captures/ss06.png and /dev/null differ
diff --git a/screen-captures/ss07.png b/screen-captures/ss07.png
deleted file mode 100644
index 67c9a1345..000000000
Binary files a/screen-captures/ss07.png and /dev/null differ
diff --git a/screen-captures/ss08.png b/screen-captures/ss08.png
deleted file mode 100644
index 1a0ae7b23..000000000
Binary files a/screen-captures/ss08.png and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index 3de6418a6..5216b8739 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,9 @@
include ':app', ':automator', ':common', ':autojs', ':inrt'
+
+include ":libs:com.android.dx-1.7.0"
+include ":libs:com.tencent.bugly.crashreport-2.6.6"
+include ":libs:jackpal.androidterm.emulatorview-1.0.42"
+include ":libs:jackpal.androidterm.libtermexec-1.0"
+include ":libs:jackpal.androidterm-1.0.70"
+include ":libs:org.mozilla.rhino-1.7.14"
+include ":libs:org.opencv-4.5.4"
\ No newline at end of file
diff --git a/version.json b/version.json
deleted file mode 100644
index 1e266f678..000000000
--- a/version.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "versionCode": 8000,
- "versionName": "Pro 8.7.6",
- "releaseNotes": "**Auto.js免费版已不再维护，建议使用Pro 8.7版本**\n* dex加密、snapshot等增强的加密方式、自定义签名、更小的打包体积\n* 可视化UI编辑、专业级单步调试、全新界面与编辑器\n* 新增大量API，压缩、加解密、OCR、加速找色等，修复大量问题\n* V9版本将支持Node.js，敬请期待",
- "downloads" : [
- {
- "name": "官网下载",
- "url": "https://pro.autojs.org/download"
- },
- {
- "name": "酷安",
- "url": "https://www.coolapk.com/apk/246247"
- },
- {
- "name": "小米商店",
- "url": "https://app.mi.com/details?id=org.autojs.autojspro"
- }
- ],
- "oldVersions": [
- {
- "versionCode": 115,
- "issues": "[测试] 当前版本为Beta版本，问题很多，请尽快更新正式版"
- },
- {
- "versionCode": "116",
- "issues": "[测试] 当前版本为Beta版本，请尽快更新正式版"
- }
- ],
- "deprecated": 116
-}
+ 
