renhaoting
/
VidiDin-Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复 - 宝箱领完之后，绿色底框上应该有“√”，现在没有

This commit is contained in:
renhaoting 2025-12-23 11:58:09 +08:00
parent f567e1bad9
commit 2c807ca4ee
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,12 +158,12 @@ class BenefitActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
tvSubtask1State.setTextColor(getStrColorByState(stateEnum)) tvSubtask1State.setTextColor(getStrColorByState(stateEnum))
with (tvSubtask1Reward) { 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) 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 val needShowNum = R.mipmap.icon_check_mark != tvRewardIcon
//setText(if (needShowNum) { ResUtil.getString(R.string.cash) + " " + curBoxState.reward_value} else "") setText(if (needShowNum) { ResUtil.getString(R.string.cash) + " " + curBoxState.reward_value} else "")
setText(ResUtil.getString(R.string.cash) + " " + curBoxState.reward_value) //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 { private fun getRewardTvDrawableRes(state: Int): Int {
when (state) { when (state) {
STATE_EXPIRED -> return R.mipmap.icon_cash_s_disable 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 else -> return R.mipmap.icon_cash_s
} }
} }

6
app/src/main/res/layout/activity_benefit.xml
View File

@ -60,7 +60,11 @@
</FrameLayout> </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 <androidx.core.widget.NestedScrollView