diff --git a/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt b/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt index c44f0599..d839fd77 100644 --- a/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt +++ b/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt @@ -44,6 +44,7 @@ import java.io.File * Created by Stardust on 2017/11/29. * Modified by SuperMonster003 as of Jun 10, 2022. * Transformed by SuperMonster003 on Oct 10, 2022. + * Modified by LZX284 (https://github.com/LZX284) as of Sep 30, 2023. */ abstract class AbstractAutoJs protected constructor(protected val application: Application) { @@ -93,14 +94,7 @@ abstract class AbstractAutoJs protected constructor(protected val application: A } private fun initContextFactory() { - ContextFactory.initGlobal( - InterruptibleAndroidContextFactory( - File( - context.cacheDir, - "classes" - ) - ) - ) + ContextFactory.initGlobal(InterruptibleAndroidContextFactory(File(context.cacheDir, "classes"))) } protected open fun createRuntime(): ScriptRuntime = ScriptRuntime.Builder() diff --git a/app/src/main/java/org/autojs/autojs/AutoJs.kt b/app/src/main/java/org/autojs/autojs/AutoJs.kt index cbeeea10..7cbed361 100644 --- a/app/src/main/java/org/autojs/autojs/AutoJs.kt +++ b/app/src/main/java/org/autojs/autojs/AutoJs.kt @@ -37,6 +37,7 @@ import java.util.concurrent.Executors * Created by Stardust on 2017/4/2. * Modified by SuperMonster003 as of Dec 1, 2021. * Transformed by SuperMonster003 on Oct 10, 2022. + * Modified by LZX284 (https://github.com/LZX284) as of Sep 30, 2023. */ open class AutoJs(private val appContext: Application) : AbstractAutoJs(appContext) { diff --git a/libs/paddleocr/build.gradle b/libs/paddleocr/build.gradle index f9128b5b..2d12e877 100644 --- a/libs/paddleocr/build.gradle +++ b/libs/paddleocr/build.gradle @@ -35,13 +35,15 @@ android { ndkVersion versionNdk compileSdk 33 defaultConfig { - minSdkVersion 24 - targetSdkVersion 31 + /* minSdk 默认为 23,这里修改为与 AutoJs6 最低 SDK 版本一致的 24. */ + minSdk 24 + targetSdk 33 externalNativeBuild { cmake { cppFlags "-std=c++11 -frtti -fexceptions -Wno-format" - arguments "-DANDROID_PLATFORM=android-23", "-DANDROID_STL=c++_shared", "-DANDROID_ARM_NEON=TRUE" + /* '-DANDROID_PLATFORM' 默认为 'android-23', 这里修改为与 AutoJs6 最低 SDK 版本一致的 24. */ + arguments '-DANDROID_PLATFORM=android-24', '-DANDROID_STL=c++_shared', "-DANDROID_ARM_NEON=TRUE" } } ndk {