From 2c807ca4ee7ba87dcaf42354b96c3ca4afb20bcb Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Tue, 23 Dec 2025 11:58:09 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20-=20=E5=AE=9D=E7=AE=B1?=
 =?UTF-8?q?=E9=A2=86=E5=AE=8C=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BB=BF=E8=89=B2?=
 =?UTF-8?q?=E5=BA=95=E6=A1=86=E4=B8=8A=E5=BA=94=E8=AF=A5=E6=9C=89=E2=80=9C?=
 =?UTF-8?q?=E2=88=9A=E2=80=9D=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=B2=A1=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vididin/features/benefit/BenefitActivity.kt        | 10 +++++-----
 app/src/main/res/layout/activity_benefit.xml           |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt
index 6eeb4db..585f84a 100644
--- a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt
@@ -158,12 +158,12 @@ class BenefitActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
                     tvSubtask1State.setTextColor(getStrColorByState(stateEnum))
 
                     with (tvSubtask1Reward) {
-                        compoundDrawablePadding = if (stateEnum == STATE_FINISH || stateEnum == STATE_CLAIMED) 0 else ResUtil.getPixelSize(R.dimen.dp3)
+                        compoundDrawablePadding = if (stateEnum == STATE_CLAIMED) 0 else ResUtil.getPixelSize(R.dimen.dp3)
                         val tvRewardIcon = getRewardTvDrawableRes(stateEnum)
-                        setCompoundDrawables(ResUtil.getDrawable(tvRewardIcon), null, null, null)
+                        setCompoundDrawablesWithIntrinsicBounds(ResUtil.getDrawable(tvRewardIcon), null, null, null)
                         val needShowNum = R.mipmap.icon_check_mark != tvRewardIcon
-                        //setText(if (needShowNum) { ResUtil.getString(R.string.cash)  + " " + curBoxState.reward_value}  else "")
-                        setText(ResUtil.getString(R.string.cash)  + " " + curBoxState.reward_value)
+                        setText(if (needShowNum) { ResUtil.getString(R.string.cash)  + " " + curBoxState.reward_value}  else "")
+                        //setText(ResUtil.getString(R.string.cash)  + " " + curBoxState.reward_value)
                     }
                 }
 
@@ -253,7 +253,7 @@ class BenefitActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
     private fun getRewardTvDrawableRes(state: Int): Int {
         when (state) {
             STATE_EXPIRED -> return R.mipmap.icon_cash_s_disable
-            STATE_FINISH, STATE_CLAIMED -> return R.mipmap.icon_check_mark
+            STATE_CLAIMED -> return R.mipmap.icon_check_mark
             else -> return R.mipmap.icon_cash_s
         }
     }
diff --git a/app/src/main/res/layout/activity_benefit.xml b/app/src/main/res/layout/activity_benefit.xml
index 061676f..865f82f 100644
--- a/app/src/main/res/layout/activity_benefit.xml
+++ b/app/src/main/res/layout/activity_benefit.xml
@@ -60,7 +60,11 @@
 
         </FrameLayout>
 
-
+        <com.gamedog.vididin.features.benefit.widget.CounterDownTimerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            />
 
 
         <androidx.core.widget.NestedScrollView