优化自动重置任务逻辑

Author: teble

app/src/main/java/me/teble/xposed/autodaily/hook/SplashActivityHook.kt

@@ -54,31 +54,17 @@ class SplashActivityHook : BaseHook() {
                     val daemonDir = context.getExternalFilesDir("xa_daemon")
                     val file = File(daemonDir, ".init_service")
                     if (file.exists()) {
-                        val accessFile = RandomAccessFile(file, "rw")
-                        val lock = accessFile.channel.tryLock()
-                        lock?.let {
-                            LogUtil.d("获取文件锁成功，守护进程未在运行？")
-                            context.openJumpModuleDialog(lock, file)
-                        }
-                    }
-                    ConfUnit.versionInfoCache ?: ConfigUtil.checkUpdate(false)
-                    val conf = loadSaveConf()
-                    val currDateStr = TimeUtil.getCNDate().formatDate()
-                    conf.taskGroups.forEach { group ->
-                        group.tasks.forEach { task ->
-                            val errInfo = task.errInfo
-                            if (errInfo.dateStr.isNotEmpty() && errInfo.dateStr != currDateStr) {
-                                if (task.retryCount != 0) {
-                                    task.retryCount = 0
-                                    task.errInfo = TaskErrorInfo()
-                                }
-                            } else if (errInfo.count >= 3 && task.retryCount < 3) {
-                                task.errInfo = TaskErrorInfo()
-                                task.retryCount++
-                                LogUtil.d("重置task: ${task.id} retryCount: ${task.retryCount}")
+                        runCatching {
+                            val accessFile = RandomAccessFile(file, "rw")
+                            val lock = accessFile.channel.tryLock()
+                            lock?.let {
+                                LogUtil.d("获取文件锁成功，守护进程未在运行？")
+                                context.openJumpModuleDialog(lock, file)
                             }
-                        }
+                        }.onFailure { LogUtil.e(it, "try lock fail: ") }
                     }
+                    ConfUnit.versionInfoCache ?: ConfigUtil.checkUpdate(false)
+                    autoResetTask(true)
                 }
                 handler.sendEmptyMessageDelayed(AUTO_EXEC, 10_000)
             }
@@ -88,11 +74,11 @@ class SplashActivityHook : BaseHook() {
             val context = it.thisObject as Activity
             scope.launch {
                 withContext(Dispatchers.IO) {
-                    loadSaveConf()
                     if (ConfUnit.versionInfoCache == null
                         || System.currentTimeMillis() - ConfUnit.lastFetchTime > 3 * 60 * 60_000L) {
                         ConfigUtil.fetchUpdateInfo()
                     }
+                    autoResetTask(false)
                 }
                 if (ConfUnit.needUpdate) {
                     context.openAppUpdateDialog()
@@ -107,6 +93,35 @@ class SplashActivityHook : BaseHook() {
 
 private lateinit var appUpdateDialog: AlertDialog
 
+private var lastAutoResetTime = 0L
+
+private fun autoResetTask(isOnCreate: Boolean) {
+    if (System.currentTimeMillis() - lastAutoResetTime < 30 * 60_000L) {
+        return
+    }
+    lastAutoResetTime = System.currentTimeMillis()
+    val conf = loadSaveConf()
+    val currDateStr = TimeUtil.getCNDate().formatDate()
+    conf.taskGroups.forEach { group ->
+        group.tasks.forEach { task ->
+            val errInfo = task.errInfo
+            if (errInfo.dateStr.isNotEmpty() && errInfo.dateStr != currDateStr) {
+                if (task.retryCount != 0) {
+                    task.retryCount = 0
+                    task.errInfo = TaskErrorInfo()
+                }
+            } else if (errInfo.count >= 3) {
+                if ((!isOnCreate && task.retryCount < 2) ||
+                    (isOnCreate && task.retryCount < 3)) {
+                    task.errInfo = TaskErrorInfo()
+                    task.retryCount++
+                    LogUtil.d("重置task: ${task.id} retryCount: ${task.retryCount}")
+                }
+            }
+        }
+    }
+}
+
 suspend fun Activity.openAppUpdateDialog() {
     withContext(Dispatchers.IO) {
         var builder: AlertDialog.Builder? = null

app/src/main/java/me/teble/xposed/autodaily/ui/SignLayout.kt

@@ -30,10 +30,12 @@ fun SignLayout(navController: NavHostController) {
             conf = ConfigUtil.loadSaveConf()
             conf.taskGroups.forEach { taskGroup ->
                 taskGroup.tasks.forEach {
-                    if (it.retryCount >= 3) {
-                        errorMap[it.id] = "任务执行失败次数过多，今日暂停执行，可能存在功能不兼容"
-                    } else if (it.errInfo.count >= 3) {
-                        errorMap[it.id] = "任务执行失败次数超过3次，本次启动暂停执行，可长按重置执行记录"
+                    if (it.errInfo.count >= 3) {
+                        if (it.retryCount >= 3) {
+                            errorMap[it.id] = "任务执行失败次数过多，今日暂停执行，可能存在功能不兼容"
+                        } else {
+                            errorMap[it.id] = "任务执行失败次数超过3次，本次启动暂停执行，可长按重置执行记录"
+                        }
                     }
                 }
             }