From d2bdb21dd72ebb00cf9e00499f1b390cf3fd3afa Mon Sep 17 00:00:00 2001
From: SuperMonster003 <wu2du2mo2gu0@gmail.com>
Date: Wed, 25 Dec 2024 13:15:53 +0800
Subject: [PATCH] =?UTF-8?q?6.6.1=20-=20Alpha2=20-=20=E8=B0=83=E6=95=B4=20N?=
 =?UTF-8?q?ativeJavaPackage=20=E6=89=93=E5=8D=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changelog/lang_zh-Hans.json                  |  2 +-
 .idea/codeStyles/Project.xml                  |  5 ----
 .../runtime/api/augment/util/Inspect.kt       | 26 +++++++------------
 .../api/augment/util/MorseCodeNativeObject.kt |  2 +-
 version.properties                            |  6 ++---
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json
index a6abe0ea..1e15f20b 100644
--- a/.changelog/lang_zh-Hans.json
+++ b/.changelog/lang_zh-Hans.json
@@ -1,7 +1,7 @@
 {
   "$data": {
     "v6.6.1": {
-      "released_date": "2024/12/09",
+      "released_date": "2024/12/25",
       "feature": [
         "pinyin 模块, 用于汉语拼音转换 (参阅 项目文档 > [汉语拼音](https://docs.autojs6.com/#/pinyin))",
         "pinyin4j 模块, 用于汉语拼音转换 (参阅 项目文档 > [汉语拼音](https://docs.autojs6.com/#/pinyin4j))",
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9e5e7252..7000196b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,11 +3,6 @@
     <option name="RIGHT_MARGIN" value="1000" />
     <AndroidXmlCodeStyleSettings>
       <option name="USE_CUSTOM_SETTINGS" value="true" />
-      <option name="LAYOUT_SETTINGS">
-        <value>
-          <option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
-        </value>
-      </option>
       <option name="MANIFEST_SETTINGS">
         <value>
           <option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />
diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/Inspect.kt b/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/Inspect.kt
index c0dc056c..505d6f3f 100644
--- a/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/Inspect.kt
+++ b/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/Inspect.kt
@@ -249,7 +249,10 @@ object Inspect : Augmentable(), Invokable {
         return formatValue(ctx, obj, ctx.depth)
     }
 
-    private fun formatValue(ctx: Ctx, value: Any?, recurseTimes: Int?): String {
+    private fun formatValue(ctx: Ctx, `val`: Any?, recurseTimes: Int?): String {
+        var value = `val`
+
+        while (value is Wrapper) value = value.unwrap()
 
         if (value is TopLevel) return "[object ${value.className}]"
 
@@ -296,21 +299,10 @@ object Inspect : Augmentable(), Invokable {
         //  ! zh-CN: 显式声明其非空性.
         if (value == null) throw ShouldNeverHappenException()
 
-        if (value !is ScriptableObject) {
-            return when {
-                value is NativeJavaPackage -> value.toString()
-                value is NativeJavaClass -> value.toString()
-                value is Wrapper -> {
-                    val o = value.unwrap()
-                    when {
-                        o.javaClass.isArray -> javaArrayToString(o)
-                        else -> toJavaObjectString(o)
-                    }
-                }
-                value.javaClass.isArray -> javaArrayToString(value)
-                else -> Context.toString(value)
-            }
-        }
+        if (value is NativeJavaPackage) return value.toString()
+        if (value is NativeJavaClass) return value.toString()
+        if (value.javaClass.isArray) return javaArrayToString(value)
+        if (value !is ScriptableObject) return Context.toString(value)
 
         // @Hint by SuperMonster003 on Apr 16, 2024.
         //  ! Check if the object has a custom overwritten toString() method.
@@ -424,7 +416,7 @@ object Inspect : Augmentable(), Invokable {
         return reduceToSingleString(output, base, braces)
     }
 
-    internal fun toJavaObjectString(value: Any) = "[JavaObject: ${value.javaClass.name}@${Integer.toHexString(value.hashCode())}]"
+    private fun toJavaObjectString(value: Any) = "[JavaObject: ${value.javaClass.name}@${Integer.toHexString(value.hashCode())}]"
 
     private fun toJavaObjectString(className: Any?, value: Any?) = "[JavaObject: $className@${Integer.toHexString(value.hashCode())}]"
 
diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/MorseCodeNativeObject.kt b/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/MorseCodeNativeObject.kt
index 4c9aab40..2d50bee4 100644
--- a/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/MorseCodeNativeObject.kt
+++ b/app/src/main/java/org/autojs/autojs/runtime/api/augment/util/MorseCodeNativeObject.kt
@@ -28,7 +28,7 @@ class MorseCodeNativeObject(val parser: MorseCodeParser) : NativeObject(), Strin
     init {
         super.exportAsJSClass(MAX_PROTOTYPE_ID, this, false)
         defineFunctionProperties(mFunctionNames, javaClass, PERMANENT)
-        defineProperty(StringReadable.KEY, newBaseFunction(StringReadable.KEY, { toStringReadable() }, NOT_CONSTRUCTABLE), PERMANENT)
+        defineProperty(StringReadable.KEY, newBaseFunction(StringReadable.KEY, { toStringReadable() }, NOT_CONSTRUCTABLE), READONLY or DONTENUM or PERMANENT)
         defineProperty("pattern", { parser.pattern.toNativeArray() }, null, PERMANENT)
         defineProperty("code", { parser.code }, null, PERMANENT)
     }
diff --git a/version.properties b/version.properties
index 6371c74c..3eaccfda 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
-#Tue Dec 24 23:39:23 CST 2024
-BUILD_TIME=1735054763832
+#Wed Dec 25 13:10:54 CST 2024
+BUILD_TIME=1735103454858
 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=2921
+VERSION_BUILD=2922
 VERSION_NAME=6.6.1 Alpha2
 VSCODE_EXT_REQUIRED_VERSION=1.0.8