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

6.6.3 - Alpha5 - 修复 dialogs.input 方法的表达式参数可能无法获得执行结果的问题

Browse Source
This commit is contained in:
SuperMonster003
2025-05-25 20:36:47 +08:00
parent 3168f2d4bb
commit e9afc6ccbb
8 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/lang_zh-Hans.json
View File

@@ -1,7 +1,7 @@
{ {
"$data": { "$data": {
"v6.6.3": { "v6.6.3": {
"released_date": "2025/05/21", "released_date": "2025/05/25",
"feature": [ "feature": [
"版本历史功能, 可查看发行版本历史更新记录 (多语言) 与统计数据", "版本历史功能, 可查看发行版本历史更新记录 (多语言) 与统计数据",
"timers.keepAlive 方法 (已全局化), 用于保持脚本活跃状态", "timers.keepAlive 方法 (已全局化), 用于保持脚本活跃状态",
@@ -20,6 +20,7 @@
"APK 文件类型信息对话框可能无法获取应用名称及 SDK 信息的问题", "APK 文件类型信息对话框可能无法获取应用名称及 SDK 信息的问题",
"Android 15 部分页面状态栏背景颜色可能无法动态跟随主题色的问题", "Android 15 部分页面状态栏背景颜色可能无法动态跟随主题色的问题",
"dialogs 模块无法正常使用 customView 属性的问题 _[`issue #364`](http://issues.autojs6.com/364)_", "dialogs 模块无法正常使用 customView 属性的问题 _[`issue #364`](http://issues.autojs6.com/364)_",
"dialogs.input 方法的表达式参数可能无法获得执行结果的问题",
"使用 JavaAdapter 时导致 ClassLoader 调用栈溢出的问题 _[`issue #376`](http://issues.autojs6.com/376)_", "使用 JavaAdapter 时导致 ClassLoader 调用栈溢出的问题 _[`issue #376`](http://issues.autojs6.com/376)_",
"console.setContentTextColor 方法导致日志字体颜色丢失默认值的问题 _[`issue #346`](http://issues.autojs6.com/346)_", "console.setContentTextColor 方法导致日志字体颜色丢失默认值的问题 _[`issue #346`](http://issues.autojs6.com/346)_",
"console.setContentBackgroundColor 方法无法接受颜色名称参数的问题 _[`issue #384`](http://issues.autojs6.com/384)_", "console.setContentBackgroundColor 方法无法接受颜色名称参数的问题 _[`issue #384`](http://issues.autojs6.com/384)_",

2
app/src/main/java/org/autojs/autojs/network/UpdateChecker.java
View File

@@ -545,7 +545,7 @@ public class UpdateChecker {
} }
private String assembleDependenciesInReleaseNotesListMarkdown(String fullReleaseNotes) { private String assembleDependenciesInReleaseNotesListMarkdown(String fullReleaseNotes) {
// TODO by SuperMonster003 on Apr 24. 2025. // TODO by SuperMonster003 on Apr 24, 2025.
// ! Remove all dependency items and append a summary item as improvement. // ! Remove all dependency items and append a summary item as improvement.
// ! Reference to `generate_markdown.py`. // ! Reference to `generate_markdown.py`.
return fullReleaseNotes; return fullReleaseNotes;

2
app/src/main/java/org/autojs/autojs/runtime/api/Shell.java
View File

@@ -248,7 +248,7 @@ public class Shell extends AbstractShell {
} }
private void onOutput(String str) { private void onOutput(String str) {
if (!str.isEmpty()) { if (!str.isEmpty() && !str.contains("/dev/input/event")) {
logDebug("onOutput: " + str); logDebug("onOutput: " + str);
} }
if (!mInitialized) { if (!mInitialized) {

10
app/src/main/java/org/autojs/autojs/runtime/api/augment/dialogs/Dialogs.kt
View File

@@ -204,7 +204,8 @@ class Dialogs(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime) {
callback.isJsNullish() -> { callback.isJsNullish() -> {
val title = coerceString(titleArg, "") val title = coerceString(titleArg, "")
val prefill = coerceString(prefillArg, "") val prefill = coerceString(prefillArg, "")
scriptRuntime.dialogs.rawInput(title, prefill, null) val result = scriptRuntime.dialogs.rawInput(title, prefill, null)
js_eval(scriptRuntime.topLevelScope, Context.toString(result))
} }
else -> { else -> {
val title = coerceString(titleArg, "") val title = coerceString(titleArg, "")
@@ -212,7 +213,12 @@ class Dialogs(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime) {
require(callback is BaseFunction) { require(callback is BaseFunction) {
"Argument callback ${callback.jsBrief()} must be a JavaScript Function for dialogs.input" "Argument callback ${callback.jsBrief()} must be a JavaScript Function for dialogs.input"
} }
scriptRuntime.dialogs.rawInput(title, prefill, callback) val newCallback = newBaseFunction("newCallback", { newCallbackArgs ->
val (str) = newCallbackArgs
val newStr = js_eval(scriptRuntime.topLevelScope, Context.toString(str))
callFunction(callback, scriptRuntime.topLevelScope, null, arrayOf(newStr))
}, NOT_CONSTRUCTABLE)
scriptRuntime.dialogs.rawInput(title, prefill, newCallback)
} }
} }
} }

15
app/src/main/java/org/autojs/autojs/runtime/api/augment/global/Classes.kt
View File

@@ -80,6 +80,9 @@ class Classes {
@JvmField @JvmField
val Log = android.util.Log::class val Log = android.util.Log::class
@JvmField
val TypedValue = android.util.TypedValue::class
@JvmField @JvmField
val ContextThemeWrapper = android.view.ContextThemeWrapper::class val ContextThemeWrapper = android.view.ContextThemeWrapper::class
@@ -92,6 +95,12 @@ class Classes {
@JvmField @JvmField
val MotionEvent = android.view.MotionEvent::class val MotionEvent = android.view.MotionEvent::class
@JvmField
val ScaleGestureDetector = android.view.ScaleGestureDetector::class
@JvmField
val WindowManager = android.view.WindowManager::class
@JvmField @JvmField
val LayoutParams = android.view.WindowManager.LayoutParams::class val LayoutParams = android.view.WindowManager.LayoutParams::class
@@ -125,6 +134,9 @@ class Classes {
@JvmField @JvmField
val Snackbar = com.google.android.material.snackbar.Snackbar::class val Snackbar = com.google.android.material.snackbar.Snackbar::class
@JvmField
val MaterialDialog = com.afollestad.materialdialogs.MaterialDialog::class
@JvmField @JvmField
val LogConfigurator = de.mindpipe.android.logging.log4j.LogConfigurator::class val LogConfigurator = de.mindpipe.android.logging.log4j.LogConfigurator::class
@@ -302,6 +314,9 @@ class Classes {
@JvmField @JvmField
val DisplayUtils = org.autojs.autojs.util.DisplayUtils::class val DisplayUtils = org.autojs.autojs.util.DisplayUtils::class
@JvmField
val IntentUtils = org.autojs.autojs.util.IntentUtils::class
@JvmField @JvmField
val JavaUtils = org.autojs.autojs.util.JavaUtils::class val JavaUtils = org.autojs.autojs.util.JavaUtils::class

18
app/src/main/java/org/autojs/autojs/runtime/api/augment/images/Images.kt
View File

@@ -258,7 +258,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
} }
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun requestScreenCapture(scriptRuntime: ScriptRuntime, args: Array<out Any?>): Boolean = ensureArgumentsAtMost(args, 2) { argList -> fun requestScreenCapture(scriptRuntime: ScriptRuntime, args: Array<out Any?>): Boolean = ensureArgumentsAtMost(args, 2) { argList ->
@@ -280,7 +280,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
} }
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun requestScreenCaptureAsync(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeObject = ensureArgumentsAtMost(args, 2) { argList -> fun requestScreenCaptureAsync(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeObject = ensureArgumentsAtMost(args, 2) { argList ->
@@ -290,14 +290,14 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
})) as NativeObject })) as NativeObject
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun stopScreenCapture(scriptRuntime: ScriptRuntime, args: Array<out Any?>) = ensureArgumentsIsEmpty(args) { fun stopScreenCapture(scriptRuntime: ScriptRuntime, args: Array<out Any?>) = ensureArgumentsIsEmpty(args) {
scriptRuntime.images.stopScreenCapture() scriptRuntime.images.stopScreenCapture()
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun getScreenCaptureOptions(scriptRuntime: ScriptRuntime, args: Array<out Any?>): ScreenCapturer.Options? = ensureArgumentsIsEmpty(args) { fun getScreenCaptureOptions(scriptRuntime: ScriptRuntime, args: Array<out Any?>): ScreenCapturer.Options? = ensureArgumentsIsEmpty(args) {
@@ -697,7 +697,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
detectColor(scriptRuntime, it) detectColor(scriptRuntime, it)
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on May 10. 2025. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on May 10, 2025.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun detectMultiColors(scriptRuntime: ScriptRuntime, args: Array<out Any?>): Boolean = ensureArgumentsLengthInRange(args, 5..6) { fun detectMultiColors(scriptRuntime: ScriptRuntime, args: Array<out Any?>): Boolean = ensureArgumentsLengthInRange(args, 5..6) {
@@ -1007,7 +1007,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
} }
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun detectAndComputeFeatures(scriptRuntime: ScriptRuntime, args: Array<out Any?>): ImageFeatures = ensureArgumentsLengthInRange(args, 1..2) { fun detectAndComputeFeatures(scriptRuntime: ScriptRuntime, args: Array<out Any?>): ImageFeatures = ensureArgumentsLengthInRange(args, 1..2) {
@@ -1022,7 +1022,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
ImageFeatures(result, opt.scale, rect) ImageFeatures(result, opt.scale, rect)
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun matchFeatures(scriptRuntime: ScriptRuntime, args: Array<out Any?>): ObjectFrame? = ensureArgumentsLengthInRange(args, 2..3) { argList -> fun matchFeatures(scriptRuntime: ScriptRuntime, args: Array<out Any?>): ObjectFrame? = ensureArgumentsLengthInRange(args, 2..3) { argList ->
@@ -1508,7 +1508,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
} }
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
private fun getDetectFeatureMethod(method: Any?): Int = when (method) { private fun getDetectFeatureMethod(method: Any?): Int = when (method) {
is Number -> method.toInt() is Number -> method.toInt()
is String -> { is String -> {
@@ -1521,7 +1521,7 @@ class Images(scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime), AsEmitt
else -> throw Error("Non-recognized method: $method") else -> throw Error("Non-recognized method: $method")
} }
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
private fun fillDetectAndComputeFeaturesOptions(rows: Int, cols: Int, options: NativeObject): DetectAndComputeFeaturesOptions { private fun fillDetectAndComputeFeaturesOptions(rows: Int, cols: Int, options: NativeObject): DetectAndComputeFeaturesOptions {
val scale = options.inquire("scale") { coerceFloatNumber(it) } ?: calcScale(rows, cols) val scale = options.inquire("scale") { coerceFloatNumber(it) } ?: calcScale(rows, cols)
val cvtColor = when { val cvtColor = when {

2
app/src/main/java/org/autojs/autojs/runtime/api/augment/images/ObjectFrame.kt
View File

@@ -3,7 +3,7 @@ package org.autojs.autojs.runtime.api.augment.images
import org.autojs.autojs.util.StringUtils import org.autojs.autojs.util.StringUtils
import org.opencv.core.Point import org.opencv.core.Point
// @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19. 2023. // @Reference to module __images__.js from Auto.js Pro 9.3.11 by SuperMonster003 on Dec 19, 2023.
/** /**
* Created by SuperMonster003 on Aug 9, 2024. * Created by SuperMonster003 on Aug 9, 2024.
*/ */

6
version.properties
View File

@@ -1,5 +1,5 @@
#Fri May 23 21:19:26 CST 2025 #Sun May 25 20:32:48 CST 2025
BUILD_TIME=1748006366599 BUILD_TIME=1748176368036
COMPILE_SDK_VERSION=35 COMPILE_SDK_VERSION=35
IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_CMAKE_VERSION=3.22.1
IMAGE_QUANT_NDK_VERSION=26.1.10909125 IMAGE_QUANT_NDK_VERSION=26.1.10909125
@@ -19,6 +19,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=35 TARGET_SDK_VERSION=35
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=3245 VERSION_BUILD=3254
VERSION_NAME=6.6.3 Alpha5 VERSION_NAME=6.6.3 Alpha5
VSCODE_EXT_REQUIRED_VERSION=1.0.8 VSCODE_EXT_REQUIRED_VERSION=1.0.8