From 19f9895f2398dfc7e2170aad2428a917a9ddfd2f Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Wed, 31 Dec 2025 11:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E9=A9=BB=E9=80=9A=E7=9F=A5=20?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gamedog/vididin/VidiDinApp.kt     |  1 +
 .../com/gamedog/vididin/main/MainActivity.kt   |  1 -
 .../builder/NotificationDataFactory.kt         | 18 +++++++++++-------
 .../notification/newUtil/NotificationDatas.kt  |  4 ++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/VidiDinApp.kt b/app/src/main/java/com/gamedog/vididin/VidiDinApp.kt
index 2a370cc..7aac15e 100644
--- a/app/src/main/java/com/gamedog/vididin/VidiDinApp.kt
+++ b/app/src/main/java/com/gamedog/vididin/VidiDinApp.kt
@@ -20,6 +20,7 @@ class VidiDinApp : BaseApp() {
 
     private fun initManagers() {
         AccountManager.getAccount()
+        TaskManager.instance().initNotificationData()
         TaskManager.instance()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt b/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt
index 6ba3171..dec5649 100644
--- a/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/main/MainActivity.kt
@@ -72,7 +72,6 @@ class MainActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabS
 
 
     override fun ViewBinding.initViews() {
-        TaskManager.instance().initNotificationData()
         activityLauncher = ActivityLauncher(this@MainActivity)
 
         navigatorAdapter = MainTabsAdapter(
diff --git a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt
index 64af477..d2d3f1b 100644
--- a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt
+++ b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt
@@ -15,6 +15,7 @@ import com.remax.notification.check.NotificationCheckController
 import com.remax.notification.config.PushContent
 import com.remax.notification.config.PushContentController
 import com.remax.notification.controller.NotificationTriggerController
+import com.remax.notification.newUtil.NotificationDatas
 import com.remax.notification.service.NotificationKeepAliveServiceManager
 import java.io.File
 import java.time.LocalDate
@@ -371,13 +372,16 @@ class ResidentModelManger {
             context.packageName,
             R.layout.layout_notification_resident_12,
             R.layout.layout_notification_resident
-        ).setOnClickPendingIntent(
-            R.id.resident_gold, entryPointPendingIntent(context,
-                type2notificationId[NotificationType.RESIDENT_GOLD] ?: 0
-            ) {
-                it.putExtra(LANDING_NOTIFICATION_ACTION, PushContent.ACTION_TYPE_GOLD)
-                it.putExtra(LANDING_NOTIFICATION_FROM, NotificationCheckController.NotificationType.RESIDENT.string)
-            })
+        ).setTextViewText(R.id.tv_resident_gold, NotificationDatas.getResidentDatas().getGoldNumber().toString())
+            .setTextViewText(R.id.tv_resident_cash, NotificationDatas.getResidentDatas().getCashNumber().toString())
+            .setTextViewText(R.id.tv_resident_box, NotificationDatas.getResidentDatas().getBoxRestTimeStr())
+            .setOnClickPendingIntent(
+                R.id.resident_gold, entryPointPendingIntent(context,
+                    type2notificationId[NotificationType.RESIDENT_GOLD] ?: 0
+                ) {
+                    it.putExtra(LANDING_NOTIFICATION_ACTION, PushContent.ACTION_TYPE_GOLD)
+                    it.putExtra(LANDING_NOTIFICATION_FROM, NotificationCheckController.NotificationType.RESIDENT.string)
+                })
             .setOnClickPendingIntent(
                 R.id.resident_cash, entryPointPendingIntent(context,
                     type2notificationId[NotificationType.RESIDENT_WITHDRAW] ?: 0
diff --git a/notification/src/main/java/com/remax/notification/newUtil/NotificationDatas.kt b/notification/src/main/java/com/remax/notification/newUtil/NotificationDatas.kt
index 778867f..3a48df1 100644
--- a/notification/src/main/java/com/remax/notification/newUtil/NotificationDatas.kt
+++ b/notification/src/main/java/com/remax/notification/newUtil/NotificationDatas.kt
@@ -249,4 +249,8 @@ object NotificationDatas {
     fun setResidentCallback(callback: IResidentDataCallback) {
         mCallback = callback
     }
+
+    fun getResidentDatas(): IResidentDataCallback {
+        return mCallback
+    }
 }
\ No newline at end of file