tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.1 - Alpha2 - 调整 NativeJavaPackage 打印格式

Browse Source
This commit is contained in:
SuperMonster003
2024-12-25 13:15:53 +08:00
parent 9005a2522c
commit d2bdb21dd7
5 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.changelog/lang_zh-Hans.json
View File

@@ -1,7 +1,7 @@
{ {
"$data": { "$data": {
"v6.6.1": { "v6.6.1": {
"released_date": "2024/12/09", "released_date": "2024/12/25",
"feature": [ "feature": [
"pinyin 模块, 用于汉语拼音转换 (参阅 项目文档 > [汉语拼音](https://docs.autojs6.com/#/pinyin))", "pinyin 模块, 用于汉语拼音转换 (参阅 项目文档 > [汉语拼音](https://docs.autojs6.com/#/pinyin))",
"pinyin4j 模块, 用于汉语拼音转换 (参阅 项目文档 > [汉语拼音](https://docs.autojs6.com/#/pinyin4j))", "pinyin4j 模块, 用于汉语拼音转换 (参阅 项目文档 > [汉语拼音](https://docs.autojs6.com/#/pinyin4j))",

5
.idea/codeStyles/Project.xml generated
View File

@@ -3,11 +3,6 @@
<option name="RIGHT_MARGIN" value="1000" /> <option name="RIGHT_MARGIN" value="1000" />
<AndroidXmlCodeStyleSettings> <AndroidXmlCodeStyleSettings>
<option name="USE_CUSTOM_SETTINGS" value="true" /> <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"> <option name="MANIFEST_SETTINGS">
<value> <value>
<option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" /> <option name="INSERT_LINE_BREAK_BEFORE_NAMESPACE_DECLARATION" value="true" />

26
app/src/main/java/org/autojs/autojs/runtime/api/augment/util/Inspect.kt
View File

@@ -249,7 +249,10 @@ object Inspect : Augmentable(), Invokable {
return formatValue(ctx, obj, ctx.depth) 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}]" if (value is TopLevel) return "[object ${value.className}]"
@@ -296,21 +299,10 @@ object Inspect : Augmentable(), Invokable {
// ! zh-CN: 显式声明其非空性. // ! zh-CN: 显式声明其非空性.
if (value == null) throw ShouldNeverHappenException() if (value == null) throw ShouldNeverHappenException()
if (value !is ScriptableObject) { if (value is NativeJavaPackage) return value.toString()
return when { if (value is NativeJavaClass) return value.toString()
value is NativeJavaPackage -> value.toString() if (value.javaClass.isArray) return javaArrayToString(value)
value is NativeJavaClass -> value.toString() if (value !is ScriptableObject) return Context.toString(value)
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)
}
}
// @Hint by SuperMonster003 on Apr 16, 2024. // @Hint by SuperMonster003 on Apr 16, 2024.
// ! Check if the object has a custom overwritten toString() method. // ! Check if the object has a custom overwritten toString() method.
@@ -424,7 +416,7 @@ object Inspect : Augmentable(), Invokable {
return reduceToSingleString(output, base, braces) 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())}]" private fun toJavaObjectString(className: Any?, value: Any?) = "[JavaObject: $className@${Integer.toHexString(value.hashCode())}]"

2
app/src/main/java/org/autojs/autojs/runtime/api/augment/util/MorseCodeNativeObject.kt
View File

@@ -28,7 +28,7 @@ class MorseCodeNativeObject(val parser: MorseCodeParser) : NativeObject(), Strin
init { init {
super.exportAsJSClass(MAX_PROTOTYPE_ID, this, false) super.exportAsJSClass(MAX_PROTOTYPE_ID, this, false)
defineFunctionProperties(mFunctionNames, javaClass, PERMANENT) 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("pattern", { parser.pattern.toNativeArray() }, null, PERMANENT)
defineProperty("code", { parser.code }, null, PERMANENT) defineProperty("code", { parser.code }, null, PERMANENT)
} }

6
version.properties
View File

@@ -1,5 +1,5 @@
#Tue Dec 24 23:39:23 CST 2024 #Wed Dec 25 13:10:54 CST 2024
BUILD_TIME=1735054763832 BUILD_TIME=1735103454858
COMPILE_SDK_VERSION=34 COMPILE_SDK_VERSION=34
JAVA_VERSION=23 JAVA_VERSION=23
JAVA_VERSION_MIN_RADICAL=0 JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
TARGET_SDK_VERSION=34 TARGET_SDK_VERSION=34
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=2921 VERSION_BUILD=2922
VERSION_NAME=6.6.1 Alpha2 VERSION_NAME=6.6.1 Alpha2
VSCODE_EXT_REQUIRED_VERSION=1.0.8 VSCODE_EXT_REQUIRED_VERSION=1.0.8