From 7c62902429815f68c48f2b257ab09b67f914d2e5 Mon Sep 17 00:00:00 2001
From: SuperMonster003 <wu2du2mo2gu0@gmail.com>
Date: Fri, 13 Dec 2024 16:48:08 +0800
Subject: [PATCH] =?UTF-8?q?6.6.1=20-=20Alpha2=20-=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC=E7=89=88=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=8A=20Android=20Studio=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                  | 24 +++++++++++++++++++
 .readme/common.json                           | 12 +++++-----
 .../autojs/autojs/core/console/ConsoleImpl.kt |  6 ++---
 .../autojs/execution/ScriptExecuteActivity.kt |  9 +++++++
 .../org/autojs/autojs/runtime/api/Images.java |  3 ++-
 .../runtime/api/augment/console/Console.kt    |  2 +-
 .../org/autojs/autojs/ui/log/LogActivity.kt   |  1 +
 libs/paddleocr/src/main/AndroidManifest.xml   |  4 +---
 libs/rapidocr/src/main/AndroidManifest.xml    |  3 ++-
 settings.gradle.kts                           |  4 ++--
 version.properties                            |  6 ++---
 11 files changed, 54 insertions(+), 20 deletions(-)

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 @@
       <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
     </JSCodeStyleSettings>
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="23" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="23" />
+      <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
@@ -40,9 +45,28 @@
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
+    <codeStyleSettings language="Groovy">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
+      <option name="LINE_COMMENT_ADD_SPACE_ON_REFORMAT" value="true" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    </codeStyleSettings>
     <codeStyleSettings language="JAVA">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
+      <option name="LINE_COMMENT_ADD_SPACE_ON_REFORMAT" value="true" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
     </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
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<out Int?>) = runWithWindow({ configurator.setContentTextColors(colors) }) {
+    fun setContentTextColors(colors: Array<out Int>) = runWithWindow({ configurator.setContentTextColors(colors) }) {
         getFloatingConsoleView()?.setTextColors(colors)
     }
 
@@ -859,7 +859,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
             private set
 
         @Volatile
-        var contentTextColors: Array<out Int?>? = null
+        var contentTextColors: Array<out Int>? = null
             private set
 
         @Volatile
@@ -923,7 +923,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
             contentTextSize = size
         }
 
-        fun setContentTextColors(colors: Array<out Int?>) = also {
+        fun setContentTextColors(colors: Array<out Int>) = 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<Int?>(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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
+<manifest />
\ 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 @@
-<manifest/>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
\ 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