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

PR 151 处理 - 恢复 OpenCV 线上部署; 统一代码风格

Browse Source
This commit is contained in:
SuperMonster003
2023-10-03 21:06:16 +08:00
parent 330ae87f4c
commit 5ee2f62d89
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt
View File

@@ -44,6 +44,7 @@ import java.io.File
* Created by Stardust on 2017/11/29. * Created by Stardust on 2017/11/29.
* Modified by SuperMonster003 as of Jun 10, 2022. * Modified by SuperMonster003 as of Jun 10, 2022.
* Transformed by SuperMonster003 on Oct 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) { 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() { private fun initContextFactory() {
ContextFactory.initGlobal( ContextFactory.initGlobal(InterruptibleAndroidContextFactory(File(context.cacheDir, "classes")))
InterruptibleAndroidContextFactory(
File(
context.cacheDir,
"classes"
)
)
)
} }
protected open fun createRuntime(): ScriptRuntime = ScriptRuntime.Builder() protected open fun createRuntime(): ScriptRuntime = ScriptRuntime.Builder()

1
app/src/main/java/org/autojs/autojs/AutoJs.kt
View File

@@ -37,6 +37,7 @@ import java.util.concurrent.Executors
* Created by Stardust on 2017/4/2. * Created by Stardust on 2017/4/2.
* Modified by SuperMonster003 as of Dec 1, 2021. * Modified by SuperMonster003 as of Dec 1, 2021.
* Transformed by SuperMonster003 on Oct 10, 2022. * 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) { open class AutoJs(private val appContext: Application) : AbstractAutoJs(appContext) {

8
libs/paddleocr/build.gradle
View File

@@ -35,13 +35,15 @@ android {
ndkVersion versionNdk ndkVersion versionNdk
compileSdk 33 compileSdk 33
defaultConfig { defaultConfig {
minSdkVersion 24 /* minSdk 默认为 23，这里修改为与 AutoJs6 最低 SDK 版本一致的 24. */
targetSdkVersion 31 minSdk 24
targetSdk 33
externalNativeBuild { externalNativeBuild {
cmake { cmake {
cppFlags "-std=c++11 -frtti -fexceptions -Wno-format" 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 { ndk {