优化通知条的提示

Author: teble

app/src/main/java/me/teble/xposed/autodaily/dex/struct/StringDataItem.kt

@@ -27,7 +27,6 @@ class StringDataItem {
         fun parser(src: ByteArray?, index: Int): StringDataItem {
             val item = StringDataItem()
             val idx = intArrayOf(index)
-            //        System.out.println(bytesToHexString(copyByte(src, index[0], 4)));
             item.size = ByteUtils.readUleb128(src, idx)
             item.dataBytes = ByteUtils.readByteString(src, idx)
             item.data = String(item.dataBytes)

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

@@ -143,7 +143,7 @@ class CoreServiceHook : BaseHook() {
                         runtimeTasks.remove(it)
                     }
                 }
-                XANotification.setContent("签到执行完毕", false)
+                XANotification.setContent("签到执行完毕", onGoing = false, isTask = true)
                 withContext(Dispatchers.IO) {
                     delay(5000)
                 }

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

@@ -70,7 +70,7 @@ class SplashActivityHook : BaseHook() {
     }
 }
 
-lateinit var appUpdateDialog: AlertDialog
+private lateinit var appUpdateDialog: AlertDialog
 
 suspend fun Activity.openAppUpdateDialog() {
     withContext(Dispatchers.IO) {
@@ -116,7 +116,7 @@ suspend fun Activity.openAppUpdateDialog() {
     }
 }
 
-lateinit var configUpdateDialog: AlertDialog
+private lateinit var configUpdateDialog: AlertDialog
 
 suspend fun Activity.openConfigUpdateLog() {
     withContext(Dispatchers.IO) {

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

@@ -17,8 +17,9 @@ import me.teble.xposed.autodaily.ui.ConfUnit
 
 object XANotification {
 
-    private const val NOTIFICATION_ID = 1101
+    private const val NOTIFICATION_ID = 0
     private const val CHANNEL_ID = "me.teble.xposed.autodaily.XA_FOREST_NOTIFY_CHANNEL"
+    private var atomicId = 1
 
     private val notificationManager by lazy {
         hostContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -35,10 +36,9 @@ object XANotification {
 
         initNotification(hostContext)
         isStart = true
-        notificationManager.notify(NOTIFICATION_ID, mNotification)
     }
 
-    fun setContent(content: String, onGoing: Boolean = true, bigText: Boolean = false) {
+    fun setContent(content: String, onGoing: Boolean = true, bigText: Boolean = false, isTask: Boolean = true) {
         if (!enabled) return
         if (!isStart) start()
 
@@ -53,7 +53,7 @@ object XANotification {
             }
             setOngoing(onGoing)
         }.build()
-        notificationManager.notify(NOTIFICATION_ID, mNotification)
+        notificationManager.notify(if (isTask) atomicId++ else NOTIFICATION_ID, mNotification)
     }
 
     fun stop() {
@@ -63,6 +63,12 @@ object XANotification {
         isStart = false
     }
 
+    fun cancelAll() {
+        if (!isStart) return
+        notificationManager.cancelAll()
+        isStart = false
+    }
+
     private fun initNotification(context: Context) {
         if (XANotification::mNotification.isInitialized) return
 

app/src/main/java/me/teble/xposed/autodaily/task/filter/GroupTaskFilterChain.kt

@@ -57,7 +57,7 @@ class GroupTaskFilterChain(
                     continue
                 }
                 try {
-                    // 进行异常计数，超过一定次数，当天不再执行该任务
+                    XANotification.setContent("正在执行任务${task.id}")
                     TaskUtil.execute(reqType, task, relayTaskMap, env.toMutableMap())
                 } catch (e: SocketTimeoutException) {
                     LogUtil.e(e, "执行任务${task.id}异常: ")