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

6.6.3 - Alpha5 - 修复 engines.all 方法可能触发 ConcurrentModificationException 的问题 (issue #394)

Browse Source
This commit is contained in:
SuperMonster003
2025-05-23 21:23:03 +08:00
parent 818e9d7e40
commit 2f0d3a7409
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.changelog/lang_zh-Hans.json
View File

@@ -25,6 +25,7 @@
"console.setContentBackgroundColor 方法无法接受颜色名称参数的问题 _[`issue #384`](http://issues.autojs6.com/384)_", "console.setContentBackgroundColor 方法无法接受颜色名称参数的问题 _[`issue #384`](http://issues.autojs6.com/384)_",
"images.compress 方法实现原理由像素降采样修正为编码质量变化", "images.compress 方法实现原理由像素降采样修正为编码质量变化",
"images.resize 方法无法正常使用的问题", "images.resize 方法无法正常使用的问题",
"engines.all 方法可能触发 ConcurrentModificationException 的问题 _[`issue #394`](http://issues.autojs6.com/394)_",
"README.md 中部分语言日期格式不正确的问题", "README.md 中部分语言日期格式不正确的问题",
"Gradle 构建脚本可能因获取到无效库档案文件长度而导致构建失败的问题 _[`issue #389`](http://issues.autojs6.com/389)_" "Gradle 构建脚本可能因获取到无效库档案文件长度而导致构建失败的问题 _[`issue #389`](http://issues.autojs6.com/389)_"
], ],

6
app/src/main/java/org/autojs/autojs/engine/ScriptEngineManager.java
View File

@@ -9,8 +9,10 @@ import org.autojs.autojs.execution.ScriptExecution;
import org.autojs.autojs.script.ScriptSource; import org.autojs.autojs.script.ScriptSource;
import org.autojs.autojs.tool.Supplier; import org.autojs.autojs.tool.Supplier;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -52,7 +54,9 @@ public class ScriptEngineManager {
} }
public Set<ScriptEngine<? extends ScriptSource>> getEngines() { public Set<ScriptEngine<? extends ScriptSource>> getEngines() {
return mEngines; synchronized (mEngines) {
return Collections.unmodifiableSet(new LinkedHashSet<>(mEngines));
}
} }
public android.content.Context getAndroidContext() { public android.content.Context getAndroidContext() {

4
app/src/main/java/org/autojs/autojs/engine/ScriptEngineService.java
View File

@@ -217,9 +217,7 @@ public class ScriptEngineService {
} }
public Set<ScriptEngine<? extends ScriptSource>> getEngines() { public Set<ScriptEngine<? extends ScriptSource>> getEngines() {
synchronized (mScriptEngineManager) { return mScriptEngineManager.getEngines();
return new LinkedHashSet<>(mScriptEngineManager.getEngines());
}
} }
public Collection<ScriptExecution> getScriptExecutions() { public Collection<ScriptExecution> getScriptExecutions() {

2
app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt
View File

@@ -61,7 +61,7 @@ open class TaskManagerFragment : ViewPagerFragment(45), ViewStatesManageable {
} }
override fun onFabClick(fab: FloatingActionButton) { override fun onFabClick(fab: FloatingActionButton) {
AutoJs.instance.scriptEngineService.stopAll() AutoJs.instance.scriptEngineService.stopAllAndToast()
} }
override fun onBackPressed(activity: Activity) = false override fun onBackPressed(activity: Activity) = false

6
version.properties
View File

@@ -1,5 +1,5 @@
#Thu May 22 17:14:04 CST 2025 #Fri May 23 21:19:26 CST 2025
BUILD_TIME=1747905244827 BUILD_TIME=1748006366599
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=3243 VERSION_BUILD=3245
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