宝箱act 顶部UI刷新 +1

app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.view.LayoutInflater
 import androidx.activity.viewModels
 import com.ama.core.architecture.appBase.AppViewsActivity
+import com.ama.core.architecture.util.ResUtil
 import com.gamedog.vididin.R
 import com.gamedog.vididin.main.interfaces.OnTabStyleListener
 import com.gamedog.vididin.manager.TaskManager
@@ -78,18 +79,42 @@ class BenefitActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
                     ivSubtask1.setImageResource(getIconResByState(stateEnum))
                     tvSubtask1State.setText(getStrResByState(stateEnum))
                     tvSubtask1State.setTextColor(getStrColorByState(stateEnum))
+
+                    with (tvSubtask1Reward) {
+                        compoundDrawablePadding = if (stateEnum == STATE_FINISH || stateEnum == STATE_CLAIMED) 0 else ResUtil.getPixelSize(R.dimen.dp3)
+                        val tvRewardIcon = getRewardTvDrawableRes(stateEnum)
+                        setCompoundDrawables(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 "")
+                    }
                 }
 
                 if (index == 1) {
                     ivSubtask2.setImageResource(getIconResByState(stateEnum))
                     tvSubtask2State.setText(getStrResByState(stateEnum))
                     tvSubtask2State.setTextColor(getStrColorByState(stateEnum))
+
+                    with (tvSubtask2Reward) {
+                        compoundDrawablePadding = if (stateEnum == STATE_FINISH || stateEnum == STATE_CLAIMED) 0 else ResUtil.getPixelSize(R.dimen.dp3)
+                        val tvRewardIcon = getRewardTvDrawableRes(stateEnum)
+                        setCompoundDrawables(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 "")
+                    }
                 }
 
                 if (index == 2) {
                     ivSubtask3.setImageResource(getIconResByState(stateEnum))
                     tvSubtask3State.setText(getStrResByState(stateEnum))
                     tvSubtask3State.setTextColor(getStrColorByState(stateEnum))
+
+                    with (tvSubtask3Reward) {
+                        compoundDrawablePadding = if (stateEnum == STATE_FINISH || stateEnum == STATE_CLAIMED) 0 else ResUtil.getPixelSize(R.dimen.dp3)
+                        val tvRewardIcon = getRewardTvDrawableRes(stateEnum)
+                        setCompoundDrawables(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 "")
+                    }
                 }
             }
 
@@ -130,6 +155,14 @@ 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
+            else -> return R.mipmap.icon_cash_s
+        }
+    }
+
 
     companion object {
         internal fun startActivity(activity: Activity) {

app/src/main/res/layout/activity_benefit.xml

@@ -129,6 +129,7 @@
                                 android:layout_marginTop="6dp"
                                 android:textSize="12sp"
                                 android:textColor="@color/gray_60"
+                                android:textStyle="bold"
                                 android:text="@string/expired"/>
                         </LinearLayout>
 
@@ -167,6 +168,7 @@
                                 android:layout_marginTop="6dp"
                                 android:textSize="12sp"
                                 android:textColor="@color/green_39"
+                                android:textStyle="bold"
                                 android:text="@string/finished"/>
                         </LinearLayout>
 
@@ -208,6 +210,7 @@
                                 android:layout_marginTop="6dp"
                                 android:textSize="12sp"
                                 android:textColor="@color/red_5c"
+                                android:textStyle="bold"
                                 android:text="@string/ongoing"/>
                         </LinearLayout>
                     </LinearLayout>

app/src/main/res/values/dimens.xml

@@ -7,4 +7,5 @@
     <dimen name="main_tab_item_padding_vertical">14dp</dimen>
     <dimen name="main_tab_item_title_test_size">16sp</dimen>
     <dimen name="dp1">1dp</dimen>
+    <dimen name="dp3">3dp</dimen>
 </resources>