Commit caa904a7 authored by mengcuiguang's avatar mengcuiguang

优化vip界面

parent 48e2cea2
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
...@@ -196,7 +196,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On ...@@ -196,7 +196,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
when (keyCode) { when (keyCode) {
KeyEvent.KEYCODE_BACK -> { KeyEvent.KEYCODE_BACK -> {
if (!UserManager.getInstance().vipFlag && UserManager.getInstance().newFlag if (!UserManager.getInstance().vipFlag && UserManager.getInstance().newFlag
&& vipList != null && vipList!!.size > 0 && vipList != null && vipList!!.size > 0 && vipList!!.get(0).price == 0.01
) { ) {
vipAdapter.setPosition(0) vipAdapter.setPosition(0)
...@@ -229,7 +229,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On ...@@ -229,7 +229,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
when (v?.id) { when (v?.id) {
R.id.ic_vip_quit -> { R.id.ic_vip_quit -> {
if (!UserManager.getInstance().vipFlag && UserManager.getInstance().newFlag && if (!UserManager.getInstance().vipFlag && UserManager.getInstance().newFlag &&
vipList != null && vipList!!.size > 0 vipList != null && vipList!!.size > 0 && vipList!!.get(0).price == 0.01
) { ) {
vipAdapter.setPosition(0) vipAdapter.setPosition(0)
vipAdapter.notifyDataSetChanged() vipAdapter.notifyDataSetChanged()
......
...@@ -147,12 +147,13 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener { ...@@ -147,12 +147,13 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
tv_my_vip.text = "开通VIP会员" tv_my_vip.text = "开通VIP会员"
tv_my_status.text = "解锁全部短剧" tv_my_status.text = "解锁全部短剧"
tv_my_btn.visibility = View.VISIBLE tv_my_btn.visibility = View.VISIBLE
if (consumer.activiteFlag == 1) { // if (consumer.activiteFlag == 1) {
//匹配用户 // //匹配用户
tv_my_btn.text = "¥0.01元开通" // tv_my_btn.text = "¥0.01元开通"
} else { // } else {
tv_my_btn.text = "立即开通" // tv_my_btn.text = "立即开通"
} // }
tv_my_btn.text = "立即开通"
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment