diff --git a/app/src/main/java/com/xiaoqu/watch/app/MainActivity.kt b/app/src/main/java/com/xiaoqu/watch/app/MainActivity.kt index 428a5f3..b6c831a 100644 --- a/app/src/main/java/com/xiaoqu/watch/app/MainActivity.kt +++ b/app/src/main/java/com/xiaoqu/watch/app/MainActivity.kt @@ -80,12 +80,23 @@ class MainActivity : AppCompatActivity() { private fun observeMqttMessages() { activityScope.launch { eventBus.events.collect { event -> - if (event is AppEvent.MqttMessageReceived && event.type == 1) { - notificationManager.onNewTaskMessage(event.rawJson) - val count = notificationManager.pendingCount - if (count > 0) { - notificationBanner.show(count) + when (event) { + is AppEvent.MqttMessageReceived -> { + if (event.type == 1) { + notificationManager.onNewTaskMessage(event.rawJson) + val count = notificationManager.pendingCount + if (count > 0) { + notificationBanner.show(count) + } + } } + // 去抖合并完成后 → 更新横幅数字 + is AppEvent.NewTaskArrived -> { + if (event.count > 0) { + notificationBanner.show(event.count) + } + } + else -> {} } } }