From 0e034f340d239466cc08a6a3807b5b2ec6064c5d Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Tue, 2 Dec 2025 11:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E5=8A=B1=E8=A7=86=E9=A2=91=20UI?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vididin/main/fragments/TasksFragment.kt      | 11 ++++++++---
 .../manager/helpers/DailyWatchAdTaskHelper.kt    | 16 ++++++++++++++++
 ...didinapp_feature_message_fragment_message.xml | 12 +++++++++---
 app/src/main/res/values/strings.xml              |  1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt
index ce9a4bd..a765dff 100644
--- a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt
+++ b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt
@@ -132,7 +132,8 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
 
             updateUIGoldTotal()
             updateUICashTotal()
-            updateDailyWatchUI()
+            updateDailyWatchVideoUI()
+            updateDailyWatchAdUI()
         }
 
         lifecycleScope.launch {
@@ -176,13 +177,17 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
         }
     }
 
-    private fun updateDailyWatchUI() {
+    private fun updateDailyWatchVideoUI() {
         val statusBean = TaskManager.instance().dailyWatchVideoStatus().getStatus()
         mDailyWatchVideoTaskViewList.forEachIndexed { index, view ->
             view.updateProgress(statusBean.getTodayWatchedCount())
         }
     }
 
+    private fun updateDailyWatchAdUI() {
+        binding?.tvAdWatchRewardNum?.text = TaskManager.instance().dailyWatchAdStatus().getAdTaskShowingText()
+    }
+
     private fun updateUIGoldTotal() {
         binding?.tvGoldTotal?.text = AccountManager.getGold().toString()
     }
@@ -203,7 +208,7 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
                 }
 
                 VididinEvents.Event_Toady_Watched_Total -> {
-                    updateDailyWatchUI()
+                    updateDailyWatchVideoUI()
                 }
             }
         }, VididinEvents.Event_Sign_State_Changed, VididinEvents.Event_Account_Cash_Changed,
diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchAdTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchAdTaskHelper.kt
index fdec068..9002ef6 100644
--- a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchAdTaskHelper.kt
+++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyWatchAdTaskHelper.kt
@@ -1,8 +1,10 @@
 package com.gamedog.vididin.manager.helpers
 
 import com.ama.core.architecture.util.DateUtil
+import com.ama.core.architecture.util.ResUtil
 import com.ama.core.architecture.util.SpUtil
 import com.ama.core.architecture.util.eventbus.NotifyMan
+import com.gamedog.vididin.R
 import com.gamedog.vididin.VididinEvents
 import com.gamedog.vididin.core.login.login.AccountManager
 import com.gamedog.vididin.manager.taskbeans.TaskStateWatchAd
@@ -69,4 +71,18 @@ class DailyWatchAdTaskHelper : BaseTaskHelper<TaskStateWatchAd>() {
         }
     }
 
+    fun getAdTaskShowingText() : String {
+        if (mStateBean.isAllTaskFinish()) {
+            return ResUtil.getString(R.string.done)
+        } else {
+            val subTaskStatusList = mStateBean.getSubTaskRewardState()
+            subTaskStatusList.forEach {
+                if (!it.isFinish) {
+                    return it.mRewardNum.toString()
+                }
+            }
+        }
+        return ""
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml
index 9f1fdaf..7766f94 100644
--- a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml
+++ b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml
@@ -201,6 +201,7 @@
                         />
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tv_box_task_state"
                         android:layout_width="58dp"
                         android:layout_height="wrap_content"
                         android:gravity="center"
@@ -235,13 +236,16 @@
                         />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="58dp"
+                        android:id="@+id/tv_ad_watch_reward_num"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:layout_marginTop="-18dp"
-                        android:text="3 dias"
+                        android:layout_marginTop="-20dp"
+                        android:text="0"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"
+                        android:drawablePadding="3dp"
+                        android:drawableStart="@mipmap/home_gold"
                         />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -269,6 +273,7 @@
                         />
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tv_game_task_state"
                         android:layout_width="58dp"
                         android:layout_height="wrap_content"
                         android:gravity="center"
@@ -304,6 +309,7 @@
                         />
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tv_zero_buy_state"
                         android:layout_width="58dp"
                         android:layout_height="wrap_content"
                         android:gravity="center"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb52cf9..3d392f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,6 +90,7 @@
     <string name="confirm">Confirmar</string>
     <string name="withdraw_fail_title">Falha no saque</string>
     <string name="withdraw_fail_desc"><![CDATA[Infelizmente, a conta que você inseriu está incorreta e o saque falhou. Clique no botão abaixo para corrigir a conta.]]></string>
+    <string name="done">Done\n</string>
 
 
 </resources>
\ No newline at end of file