diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt index 513b3cff6..c52a0e49e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt @@ -173,9 +173,40 @@ class MeFragment : BaseFragment(), View.OnClickListener { mBinding.seekBarVip.max = it.levelUpScore mBinding.seekBarVip.progress = it.currScore.coerceAtMost(it.levelUpScore) mBinding.meItemVip.setBackgroundResource(R.drawable.bg_vip_me_entrance_opened) + mBinding.tvVipName.setTextColor( + ContextCompat.getColor( + mContext, + R.color.color_413078 + ) + ) + mBinding.tvVipDesc.setTextColor( + ContextCompat.getColor( + mContext, + R.color.color_5E4D98 + ) + ) + mBinding.ivVipArrow.visibility = View.GONE } ?: run { mBinding.ivVipIcon.isVisible = false mBinding.flVipSeek.isVisible = false + mBinding.tvVipName.text = getString(R.string.me_noble_center) + mBinding.tvVipDesc.text = getString(R.string.me_open_various_privileges) + + mBinding.meItemVip.setBackgroundResource(R.drawable.bg_vip_me_entrance) + + mBinding.tvVipName.setTextColor( + ContextCompat.getColor( + mContext, + R.color.color_93570B + ) + ) + mBinding.tvVipDesc.setTextColor( + ContextCompat.getColor( + mContext, + R.color.color_AA6F29 + ) + ) + mBinding.ivVipArrow.visibility = View.VISIBLE } } @@ -243,7 +274,9 @@ class MeFragment : BaseFragment(), View.OnClickListener { val giftList = initInfo?.giveGiftErbanNoList val levelSep = it.userLevelVo.experLevelSeq if (diamondList?.contains(it.erbanNo) == true || giftList?.contains(it.erbanNo) == true - || levelSep >= (initInfo?.giveDiamondExperLevel ?: 0) || levelSep >= (initInfo?.giveGiftExperLevel ?: 0)) { + || levelSep >= (initInfo?.giveDiamondExperLevel + ?: 0) || levelSep >= (initInfo?.giveGiftExperLevel ?: 0) + ) { mBinding.tvMyRoomRight.visibility = View.GONE mBinding.tvMyRoom.visibility = View.VISIBLE mBinding.tvEarnRight.visibility = View.GONE diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 53367e288..d2a6a2a58 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -341,6 +341,7 @@ android:onClick="@{click}" android:orientation="vertical" android:paddingStart="14dp" + android:paddingEnd="0dp" app:layout_constraintDimensionRatio="328:128" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/me_item_wallet" @@ -394,6 +395,7 @@ android:textSize="@dimen/sp_10" /> #DE9F0C #EFEFEF #EB82AB + #413078 + #5E4D98 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ef5b7cf1c..6a8feff7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -995,8 +995,8 @@ 個人中心banner模塊點擊 個人中心快捷進房點擊成功匹配 個人中心快捷進房點擊成功匹配 - 還差 - 權力值升級 + 距升級還差 + 權力值 貴族我的入口點擊事件 個人中心貴族卡片片點擊 個人中心充值卡片點擊