diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index af24f246..b8bc541e 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -25,6 +25,7 @@ "console.setContentBackgroundColor 方法无法接受颜色名称参数的问题 _[`issue #384`](http://issues.autojs6.com/384)_", "images.compress 方法实现原理由像素降采样修正为编码质量变化", "images.resize 方法无法正常使用的问题", + "engines.all 方法可能触发 ConcurrentModificationException 的问题 _[`issue #394`](http://issues.autojs6.com/394)_", "README.md 中部分语言日期格式不正确的问题", "Gradle 构建脚本可能因获取到无效库档案文件长度而导致构建失败的问题 _[`issue #389`](http://issues.autojs6.com/389)_" ], diff --git a/app/src/main/java/org/autojs/autojs/engine/ScriptEngineManager.java b/app/src/main/java/org/autojs/autojs/engine/ScriptEngineManager.java index b1319034..480e9b57 100644 --- a/app/src/main/java/org/autojs/autojs/engine/ScriptEngineManager.java +++ b/app/src/main/java/org/autojs/autojs/engine/ScriptEngineManager.java @@ -9,8 +9,10 @@ import org.autojs.autojs.execution.ScriptExecution; import org.autojs.autojs.script.ScriptSource; import org.autojs.autojs.tool.Supplier; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -52,7 +54,9 @@ public class ScriptEngineManager { } public Set> getEngines() { - return mEngines; + synchronized (mEngines) { + return Collections.unmodifiableSet(new LinkedHashSet<>(mEngines)); + } } public android.content.Context getAndroidContext() { diff --git a/app/src/main/java/org/autojs/autojs/engine/ScriptEngineService.java b/app/src/main/java/org/autojs/autojs/engine/ScriptEngineService.java index 844dd001..f5e40103 100644 --- a/app/src/main/java/org/autojs/autojs/engine/ScriptEngineService.java +++ b/app/src/main/java/org/autojs/autojs/engine/ScriptEngineService.java @@ -217,9 +217,7 @@ public class ScriptEngineService { } public Set> getEngines() { - synchronized (mScriptEngineManager) { - return new LinkedHashSet<>(mScriptEngineManager.getEngines()); - } + return mScriptEngineManager.getEngines(); } public Collection getScriptExecutions() { diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt index 57c09f5f..a10788e0 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt +++ b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt @@ -61,7 +61,7 @@ open class TaskManagerFragment : ViewPagerFragment(45), ViewStatesManageable { } override fun onFabClick(fab: FloatingActionButton) { - AutoJs.instance.scriptEngineService.stopAll() + AutoJs.instance.scriptEngineService.stopAllAndToast() } override fun onBackPressed(activity: Activity) = false diff --git a/version.properties b/version.properties index 77a44e1d..89d389ad 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Thu May 22 17:14:04 CST 2025 -BUILD_TIME=1747905244827 +#Fri May 23 21:19:26 CST 2025 +BUILD_TIME=1748006366599 COMPILE_SDK_VERSION=35 IMAGE_QUANT_CMAKE_VERSION=3.22.1 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 TARGET_SDK_VERSION=35 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=3243 +VERSION_BUILD=3245 VERSION_NAME=6.6.3 Alpha5 VSCODE_EXT_REQUIRED_VERSION=1.0.8