From 294100b1462d9f39b781c4a942c7ae540ff8fe3b Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 4 Dec 2025 14:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=89=8B=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81UI=20=E8=B7=9F=E9=9A=8F=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   | 20 +++++++++++++------
 .../task/widget/BeginnerTaskItemView.kt       | 10 ++++++----
 app/src/main/res/values/strings.xml           |  4 ++--
 3 files changed, 22 insertions(+), 12 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 aa1f7dc..c2f0cd2 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
@@ -108,29 +108,37 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
 
 
             with(beginnerTaskWithdraw) {
-                initUI(R.mipmap.icon_cash_s, R.string.beginner_withdraw_title, R.string.beginner_withdraw_desc,R.string.resgatar)
+                initUI(R.mipmap.icon_cash_s, R.string.beginner_withdraw_title, R.string.resgatar)
                 //setRewardTextStyle(21, R.color.green_39)
                 setActionFun {
                     gotoWithDraw()
                 }
-                setRewardInfo(TaskManager.instance().getNewbieFirstWithdrawTask()!!)
+                val stateBean = TaskManager.instance().newbieFirstWithdrawStatus().getStatusBean()
+                setTaskStateInfo(stateBean.rewardGoldNum.toString(),
+                    if (stateBean.hasClaimReward) R.string.finished else R.string.go_and_do,
+                    ResUtil.getString(R.string.beginner_withdraw_desc))
             }
 
 
             with(beginnerTaskDiscord) {
-                initUI(R.mipmap.icon_dicord, R.string.beginner_discord_title, R.string.beginner_discord_desc,R.string.resgatar)
+                initUI(R.mipmap.icon_dicord, R.string.beginner_discord_title,R.string.resgatar)
                 setActionFun {
                     gotoDiscord()
                 }
-                setRewardInfo(TaskManager.instance().getNewbieJoinDiscordTask()!!)
+                val stateBean = TaskManager.instance().newbieJoinDiscordStatus().getStatusBean()
+                setTaskStateInfo(stateBean.rewardGoldNum.toString(), if (stateBean.hasClaimReward) R.string.finished else R.string.go_and_do,
+                    String.format(ResUtil.getString(R.string.beginner_discord_desc), stateBean.rewardGoldNum))
             }
 
             with(beginnerTaskEnableNotify) {
-                initUI(R.mipmap.icon_notify, R.string.beginner_notify_title, R.string.beginner_notify_desc,R.string.Resgatado)
+                initUI(R.mipmap.icon_notify, R.string.beginner_notify_title,R.string.Resgatado)
                 beginnerTaskEnableNotify.setActionFun {
                     gotoNotification()
                 }
-                setTaskStateInfo(TaskManager.instance().newbieEnableNotifyStatus())
+
+                val stateBean = TaskManager.instance().newbieEnableNotifyStatus().getStatusBean()
+                setTaskStateInfo(stateBean.rewardGoldNum.toString(), if (stateBean.hasClaimReward) R.string.finished else R.string.go_and_do,
+                    String.format(ResUtil.getString(R.string.beginner_notify_desc), stateBean.rewardGoldNum))
             }
 
 
diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt
index ea31438..3e69bd1 100644
--- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt
+++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
+import com.ama.core.architecture.util.ResUtil
 import com.ama.core.architecture.util.setOnClickBatch
 import com.gamedog.vididin.R
 import com.gamedog.vididin.VidiConst
@@ -36,11 +37,10 @@ class BeginnerTaskItemView @JvmOverloads constructor(
     }
 
 
-    fun initUI(titleIconRes: Int, titleRes: Int, desRes: Int, actionRes: Int) {
+    fun initUI(titleIconRes: Int, titleRes: Int, actionRes: Int) {
         mBinding.ivItemIcon.setImageResource(titleIconRes)
         mBinding.tvItemTitle.setText(titleRes)
         mBinding.tvAction.setText(actionRes)
-        mBinding.tvItemDescrible.setText(desRes)
     }
 
 
@@ -60,8 +60,10 @@ class BeginnerTaskItemView @JvmOverloads constructor(
         mBinding.tvRewardNum.setTextColor(color)
     }
 
-    fun setTaskStateInfo(newbieEnableNotifyStatus: NewbieEnableNotifyHelper) {
-
+    fun setTaskStateInfo(rewardNum: String, textRes: Int, describleStr: String) {
+        mBinding.tvRewardNum.text = rewardNum
+        mBinding.tvAction.setText(textRes)
+        mBinding.tvItemDescrible.text = describleStr
     }
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2180998..24f7ef0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,9 +29,9 @@
     <string name="daily_video_task_title">Assistir a %d vídeo</string>
     <string name="daily_ad_task_title">Assistir a %d Anúncio</string>
     <string name="beginner_notify_title">Notificações push</string>
-    <string name="beginner_notify_desc">Ative as notificações e ganhe 200 moedas!</string>
+    <string name="beginner_notify_desc">Ative as notificações e ganhe %d moedas!</string>
     <string name="beginner_discord_title">Comunidade Discord</string>
-    <string name="beginner_discord_desc">Junte-se à nossa comunidade e ganhe 150 moedas!</string>
+    <string name="beginner_discord_desc">Junte-se à nossa comunidade e ganhe %d moedas!</string>
     <string name="beginner_withdraw_desc">Um benefício exclusivo. Saque R$0,1 AGORA!</string>
     <string name="Resgatado">Resgatado</string>
     <string name="total_cash">Total sacado:</string>