diff --git a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt index 0c72af503..75f06f609 100644 --- a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt @@ -211,7 +211,7 @@ class VipMainActivity : BaseViewBindingActivity(), } } - binding.tvOpenVip.setOnClickListener { + binding.layoutOpenVip.setOnClickListener { checkBuyVip { buyVip() } @@ -521,15 +521,15 @@ class VipMainActivity : BaseViewBindingActivity(), currentVipInfo.vipName ) }" - binding.tvOpenVip.isVisible = true + binding.layoutOpenVip.isVisible = true } else { - binding.tvOpenVip.isVisible = false + binding.layoutOpenVip.isVisible = false } } else { currentChargeInfo = null - binding.tvOpenVip.isVisible = false + binding.layoutOpenVip.isVisible = false } - if (binding.tvOpenVip.isVisible && binding.layoutLevelProgress.isVisible) { + if (binding.layoutOpenVip.isVisible && binding.layoutLevelProgress.isVisible) { binding.layoutBottomPanel.setBackgroundDrawable(binding.layoutLevelProgress.background) } else { binding.layoutBottomPanel.setBackgroundDrawable(null) diff --git a/app/src/main/res/drawable-xhdpi/bg_vip_my_level.webp b/app/src/main/res/drawable-xhdpi/bg_vip_my_level.webp deleted file mode 100644 index 92bd4f7f0..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_vip_my_level.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_vip_auth_text.webp b/app/src/main/res/drawable-xhdpi/ic_vip_auth_text.webp deleted file mode 100644 index 5cf43a3cb..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_vip_auth_text.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_vip_my_level.png b/app/src/main/res/drawable-xxhdpi/bg_vip_my_level.png new file mode 100644 index 000000000..fcc89496f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_vip_my_level.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_vip_auth_text.png b/app/src/main/res/drawable-xxhdpi/ic_vip_auth_text.png new file mode 100644 index 000000000..ab076b076 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_vip_auth_text.png differ diff --git a/app/src/main/res/drawable-xxhdpi/vip_ic_rebate.png b/app/src/main/res/drawable-xxhdpi/vip_ic_rebate.png index c40534389..6dc366aad 100644 Binary files a/app/src/main/res/drawable-xxhdpi/vip_ic_rebate.png and b/app/src/main/res/drawable-xxhdpi/vip_ic_rebate.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e75e76b15..1a9beb282 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4294,7 +4294,7 @@ Current Level Vip1 Remainder: - Power Value Can Upgrade To + Can Upgrade To Vip2 Reached Highest Usable VIP Level Remaining Time: diff --git a/app/src/module_labour_union/res/layout/activity_vip_main.xml b/app/src/module_labour_union/res/layout/activity_vip_main.xml index 3e8631927..91da6f81a 100644 --- a/app/src/module_labour_union/res/layout/activity_vip_main.xml +++ b/app/src/module_labour_union/res/layout/activity_vip_main.xml @@ -428,10 +428,9 @@ + android:textSize="@dimen/sp_9" /> + android:textSize="@dimen/sp_9" /> @@ -470,7 +469,7 @@ android:layout_height="wrap_content" android:text="@string/layout_activity_vip_main_07" android:textColor="#ffbc9e66" - android:textSize="@dimen/sp_10" /> + android:textSize="@dimen/sp_9" /> + android:textSize="@dimen/sp_9" /> + android:textSize="@dimen/sp_9" /> @@ -602,23 +601,33 @@ - + tools:visibility="visible"> + + + + \ No newline at end of file