diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f4b728be..9e5e7252 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -28,6 +28,11 @@
+
+
+
+
+
@@ -40,9 +45,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.readme/common.json b/.readme/common.json
index 85fe0b0e..f256b73c 100644
--- a/.readme/common.json
+++ b/.readme/common.json
@@ -1,11 +1,11 @@
{
- "android_studio_latest_recommended_version_name": "Android Studio Ladybug | 2024.2.1 Patch 2",
- "var_date_android_studio_latest_recommended_version_name": "2024/10/31",
- "android_studio_latest_recommended_file_name_of_exe": "android-studio-2024.2.1.11-windows.exe",
- "android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2024.2.1.11/android-studio-2024.2.1.11-windows.exe",
+ "android_studio_latest_recommended_version_name": "Android Studio Ladybug | 2024.2.1 Patch 3",
+ "var_date_android_studio_latest_recommended_version_name": "2024/12/02",
+ "android_studio_latest_recommended_file_name_of_exe": "android-studio-2024.2.1.12-windows.exe",
+ "android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2024.2.1.12/android-studio-2024.2.1.12-windows.exe",
"android_studio_latest_recommended_file_size_of_exe": "1.13 GB",
- "android_studio_latest_recommended_file_name_of_zip": "android-studio-2024.2.1.11-windows.zip",
- "android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.1.11/android-studio-2024.2.1.11-windows.zip",
+ "android_studio_latest_recommended_file_name_of_zip": "android-studio-2024.2.1.12-windows.zip",
+ "android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.1.12/android-studio-2024.2.1.12-windows.zip",
"android_studio_latest_recommended_file_size_of_zip": "1.14 GB",
"var_date_contribution_table_data_updated": "2024/10/23",
"latest_rhino_engine_name_with_github_lineno_address": "[v1.7.16-SNAPSHOT](http://rhino.autojs6.com/blob/master/gradle.properties#L3)",
diff --git a/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt b/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt
index 1eb202ad..1918a480 100644
--- a/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt
+++ b/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt
@@ -632,7 +632,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
fun getContentTextSize() = getFloatingConsoleView()?.textSize ?: 0f
@ScriptInterface
- fun setContentTextColors(colors: Array) = runWithWindow({ configurator.setContentTextColors(colors) }) {
+ fun setContentTextColors(colors: Array) = runWithWindow({ configurator.setContentTextColors(colors) }) {
getFloatingConsoleView()?.setTextColors(colors)
}
@@ -859,7 +859,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
private set
@Volatile
- var contentTextColors: Array? = null
+ var contentTextColors: Array? = null
private set
@Volatile
@@ -923,7 +923,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
contentTextSize = size
}
- fun setContentTextColors(colors: Array) = also {
+ fun setContentTextColors(colors: Array) = also {
contentTextColors = colors
}
diff --git a/app/src/main/java/org/autojs/autojs/execution/ScriptExecuteActivity.kt b/app/src/main/java/org/autojs/autojs/execution/ScriptExecuteActivity.kt
index 62e26ebb..fd6cf1a2 100644
--- a/app/src/main/java/org/autojs/autojs/execution/ScriptExecuteActivity.kt
+++ b/app/src/main/java/org/autojs/autojs/execution/ScriptExecuteActivity.kt
@@ -38,6 +38,13 @@ class ScriptExecuteActivity : AppCompatActivity() {
private lateinit var mScriptExecution: ActivityScriptExecution
private var mRuntime: ScriptRuntime? = null
+ @ScriptInterface
+ val emitter: EventEmitter?
+ get() = when {
+ ::eventEmitter.isInitialized -> eventEmitter
+ else -> null
+ }
+
@ScriptInterface
lateinit var eventEmitter: EventEmitter
private set
@@ -199,7 +206,9 @@ class ScriptExecuteActivity : AppCompatActivity() {
}
fun emit(event: String?, vararg args: Any?) {
+ event ?: return
try {
+ mRuntime?.events?.emit(event, *args)
eventEmitter.emit(event, *args)
} catch (e: Exception) {
mRuntime?.exit(e)
diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/Images.java b/app/src/main/java/org/autojs/autojs/runtime/api/Images.java
index 4c0168e0..01f257f7 100644
--- a/app/src/main/java/org/autojs/autojs/runtime/api/Images.java
+++ b/app/src/main/java/org/autojs/autojs/runtime/api/Images.java
@@ -54,6 +54,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import static android.app.Activity.RESULT_OK;
import static org.autojs.autojs.util.RhinoUtils.isMainThread;
import static org.autojs.autojs.util.StringUtils.str;
@@ -196,7 +197,7 @@ public class Images {
mScreenCaptureRequester.request(contextForRequest, new ScreenCaptureRequester.Callback() {
@Override
public void onRequestResult(int resultCode, @Nullable Intent intent) {
- if (resultCode == -1 && intent != null) {
+ if (resultCode == RESULT_OK && intent != null) {
try {
ScreenCapturer.Options options = new ScreenCapturer.Options(
width, height, orientation, ScreenMetrics.getDeviceScreenDensity(), isAsync
diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt b/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt
index edfdcc95..be0b0422 100644
--- a/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt
+++ b/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt
@@ -413,7 +413,7 @@ class Console(scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRuntime) {
scriptRuntime.console.setContentTextColors(o.map { S13n.color(arrayOf(it)) }.toTypedArray())
}
is NativeObject -> {
- val tmp = Array(6) { null }
+ val tmp = Array(6) { 0 }
listOf("verbose", "log", "info", "warn", "error", "assert").forEachIndexed { index, key ->
if (o.hasProp(key)) {
tmp[index] = S13n.color(arrayOf(o.prop(key)))
diff --git a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt
index 3e0602b6..f28285b7 100644
--- a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.kt
@@ -46,6 +46,7 @@ class LogActivity : BaseActivity() {
return true
}
+ @Deprecated("Deprecated in Java")
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
diff --git a/libs/paddleocr/src/main/AndroidManifest.xml b/libs/paddleocr/src/main/AndroidManifest.xml
index a5918e68..568741e5 100644
--- a/libs/paddleocr/src/main/AndroidManifest.xml
+++ b/libs/paddleocr/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/libs/rapidocr/src/main/AndroidManifest.xml b/libs/rapidocr/src/main/AndroidManifest.xml
index 15e7c2ae..568741e5 100644
--- a/libs/rapidocr/src/main/AndroidManifest.xml
+++ b/libs/rapidocr/src/main/AndroidManifest.xml
@@ -1 +1,2 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dae913a2..c1079a70 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -133,8 +133,8 @@ pluginManagement {
val androidStudio = object : Platform(
name = "AndroidStudio", abbr = "as", vendor = "Google",
androidVersionMap = mapOf(
- "2024.3" to "8.9.0-alpha03", /* Nov 29 2024. */
- "2024.2" to "8.7.2", /* Nov 1 2024. */
+ "2024.3" to "8.9.0-alpha05", /* Dec 13 2024. */
+ "2024.2" to "8.7.3", /* Dec 13 2024. */
"2024.1" to "8.6.0", /* Aug 30, 2024. */
"2023.3" to "8.5.0-alpha02", /* Mar 28, 2024. */
"2023.2" to "8.3.0-rc02", /* Feb 14, 2024. */
diff --git a/version.properties b/version.properties
index a1f688de..74a3bf97 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
-#Tue Dec 10 15:37:07 CST 2024
-BUILD_TIME=1733816227848
+#Fri Dec 13 16:40:27 CST 2024
+BUILD_TIME=1734079227022
COMPILE_SDK_VERSION=34
JAVA_VERSION=23
JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
TARGET_SDK_VERSION=34
TARGET_SDK_VERSION_INRT=29
-VERSION_BUILD=2903
+VERSION_BUILD=2909
VERSION_NAME=6.6.1 Alpha2
VSCODE_EXT_REQUIRED_VERSION=1.0.8