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(), 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(), 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 @@ - +