diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7b707473..6d16bce8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,6 +30,13 @@ + + + + + + + diff --git a/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java b/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java index 4f9b3155..5109e484 100644 --- a/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java +++ b/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java @@ -140,14 +140,19 @@ public class AutoJs extends com.stardust.autojs.AutoJs { if (AccessibilityServiceTool.disableAccessibilityServiceByAdb() && AccessibilityServiceTool.enableAccessibilityServiceByAdbAndWaitFor( 2000)) { // 重新获取无障碍权限成功 - return null; + if (AccessibilityService.Companion.getInstance() != null) { + return null; + } } } errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running); } else { if (Pref.haveAdbPermission(getApplication())) { if (AccessibilityServiceTool.enableAccessibilityServiceByAdbAndWaitFor( 2000)) { - return null; + if (AccessibilityService.Companion.getInstance() != null) { + return null; + } + errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission); } } if (Pref.shouldEnableAccessibilityServiceByRoot()) { diff --git a/autojs/build.gradle b/autojs/build.gradle index b2e51b0b..2dc4b96d 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -82,7 +82,7 @@ dependencies { api project(path: ':common') api project(path: ':automator') // implementation 'com.rmtheis:tess-two:9.1.0' - implementation 'com.google.mlkit:text-recognition-chinese:16.0.0' + implementation 'com.google.mlkit:text-recognition-chinese:16.0.1' implementation 'com.microsoft.onnxruntime:onnxruntime-android:1.15.1' } diff --git a/build.gradle b/build.gradle index 7692c01b..617379fb 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import groovy.json.JsonSlurper // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { mavenCentral() google()