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

6.6.0 - Fix3 - 修复 Temurin 平台无法构建项目; OCR 模块参数数量限制错误

Browse Source
This commit is contained in:
SuperMonster003
2024-12-02 16:54:00 +08:00
parent 3ec26dc281
commit d3363f11b5
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/autojs/autojs/runtime/api/augment/ocr/Ocr.kt
View File

@@ -71,7 +71,7 @@ class Ocr(private val scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime)
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { argList -> fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) { argList ->
val (arg0, arg1, arg2) = argList val (arg0, arg1, arg2) = argList
when { when {
@@ -149,7 +149,7 @@ class Ocr(private val scriptRuntime: ScriptRuntime) : Augmentable(scriptRuntime)
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { argList -> fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) { argList ->
val (arg0, arg1, arg2) = argList val (arg0, arg1, arg2) = argList
when { when {

4
app/src/main/java/org/autojs/autojs/runtime/api/augment/ocr/OcrMLKit.kt
View File

@@ -26,13 +26,13 @@ class OcrMLKit(private val scriptRuntime: ScriptRuntime) : Augmentable(scriptRun
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) {
Ocr.commonRecognizeText(scriptRuntime, OcrMode.MLKIT, *it) Ocr.commonRecognizeText(scriptRuntime, OcrMode.MLKIT, *it)
} }
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) {
Ocr.commonDetect(scriptRuntime, OcrMode.MLKIT, *it) Ocr.commonDetect(scriptRuntime, OcrMode.MLKIT, *it)
} }

4
app/src/main/java/org/autojs/autojs/runtime/api/augment/ocr/OcrPaddle.kt
View File

@@ -33,13 +33,13 @@ class OcrPaddle(private val scriptRuntime: ScriptRuntime) : Augmentable(scriptRu
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) {
Ocr.commonRecognizeText(scriptRuntime, OcrMode.PADDLE, *it) Ocr.commonRecognizeText(scriptRuntime, OcrMode.PADDLE, *it)
} }
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) {
Ocr.commonDetect(scriptRuntime, OcrMode.PADDLE, *it) Ocr.commonDetect(scriptRuntime, OcrMode.PADDLE, *it)
} }

4
app/src/main/java/org/autojs/autojs/runtime/api/augment/ocr/OcrRapid.kt
View File

@@ -26,13 +26,13 @@ class OcrRapid(private val scriptRuntime: ScriptRuntime) : Augmentable(scriptRun
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { fun recognizeText(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) {
Ocr.commonRecognizeText(scriptRuntime, OcrMode.RAPID, *it) Ocr.commonRecognizeText(scriptRuntime, OcrMode.RAPID, *it)
} }
@JvmStatic @JvmStatic
@RhinoRuntimeFunctionInterface @RhinoRuntimeFunctionInterface
fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 2) { fun detect(scriptRuntime: ScriptRuntime, args: Array<out Any?>): NativeArray = ensureArgumentsAtMost(args, 3) {
Ocr.commonDetect(scriptRuntime, OcrMode.RAPID, *it) Ocr.commonDetect(scriptRuntime, OcrMode.RAPID, *it)
} }

6
version.properties
View File

@@ -1,5 +1,5 @@
#Mon Dec 02 14:58:14 CST 2024 #Mon Dec 02 16:52:56 CST 2024
BUILD_TIME=1733122694239 BUILD_TIME=1733129576279
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=2882 VERSION_BUILD=2883
VERSION_NAME=6.6.0 VERSION_NAME=6.6.0
VSCODE_EXT_REQUIRED_VERSION=1.0.8 VSCODE_EXT_REQUIRED_VERSION=1.0.8