x1ongzhu 1 год назад
Родитель
Сommit
89fcc989e6

+ 1 - 1
app/build.gradle

@@ -24,7 +24,7 @@ android {
         applicationId "com.example.modifier"
         minSdk 26
         targetSdk 34
-        versionCode 117
+        versionCode 118
         versionName "1.0.1"
         archivesBaseName = "modifier-${versionCode}"
 

+ 5 - 5
app/src/main/java/com/example/modifier/service/ModifierService.kt

@@ -836,7 +836,7 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
         return state
     }
 
-    suspend fun toggleRcsSwitch(on: Boolean, retry: Int = 3): Boolean {
+    suspend fun toggleRcsSwitch(state: Boolean, retry: Int = 3): Boolean {
         val res = TraverseResult()
 
         shellRun(CMD_RCS_SETTINGS_ACTIVITY, "sleep 0.5")
@@ -847,12 +847,12 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
                 if (res.rcsSwitch == null) {
                     shellRun(CMD_BACK, "sleep 0.5", CMD_RCS_SETTINGS_ACTIVITY, "sleep 0.5")
                 } else {
-                    if (res.rcsSwitch!!.isChecked == on) {
+                    if (res.rcsSwitch!!.isChecked == state) {
                         return@repeatBlock true
                     }
                     val rect = Rect()
                     res.rcsSwitch!!.getBoundsInScreen(rect)
-                    if (on) {
+                    if (state) {
                         shellRun(
                             "input tap ${rect.centerX()} ${rect.centerY()}", "sleep 1",
                         )
@@ -881,7 +881,7 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
                     }
                     res.rcsSwitch = null
                     traverseNode(rootInActiveWindow, res)
-                    if (res.rcsSwitch?.isChecked == on) {
+                    if (res.rcsSwitch?.isChecked == state) {
                         return@repeatBlock true
                     }
                 }
@@ -1067,7 +1067,7 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
         withTimeoutOrNull(1.hours) {
             while (true) {
                 delay(200)
-                needRest = needRest || retry > 2 || requestNumberCount > 15
+                needRest = needRest || retry > 2 || requestNumberCount > 5
                 try {
                     if (requestMode == 2 && !noBackup) {
                         val backup = backupItemDao.findBackupForRestore(