diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index b10bb64a..7883e864 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -3,7 +3,8 @@ "v6.6.1": { "released_date": "2024/12/03", "fix": [ - "部分环境因回退版本过低而无法正常编译项目的问题" + "部分环境因回退版本过低而无法正常编译项目的问题", + "调用不存在的方法时可能出现的 \"非原始类型值\" 异常" ], "improvement": [ "脚本项目识别在 project.json 损坏情况下尽可能还原关键信息" diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index de8b1f39..eb73efc0 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -19,6 +19,8 @@ diff --git a/app/src/main/java/org/autojs/autojs/util/RhinoUtils.kt b/app/src/main/java/org/autojs/autojs/util/RhinoUtils.kt index 6021aa5a..0f79a71b 100644 --- a/app/src/main/java/org/autojs/autojs/util/RhinoUtils.kt +++ b/app/src/main/java/org/autojs/autojs/util/RhinoUtils.kt @@ -864,7 +864,10 @@ object RhinoUtils { override fun toString(): String = "function ${funcName ?: ""}() { ... }" - override fun getDefaultValue(typeHint: Class<*>?) = this + override fun getDefaultValue(typeHint: Class<*>?) = when (typeHint) { + org.mozilla.javascript.ScriptRuntime.StringClass -> toString() + else -> this + } } diff --git a/version.properties b/version.properties index 4363ebfe..142b0d5d 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Tue Dec 03 21:27:01 CST 2024 -BUILD_TIME=1733232421738 +#Wed Dec 04 17:11:59 CST 2024 +BUILD_TIME=1733303519833 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=2889 +VERSION_BUILD=2891 VERSION_NAME=6.6.1 Alpha2 VSCODE_EXT_REQUIRED_VERSION=1.0.8