Commit ef320078 authored by jyx's avatar jyx

删除一分钱显示

parent 991fbea3
...@@ -107,9 +107,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -107,9 +107,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} else { } else {
vipPresenter.userLogin(isAliPayInstalled()) vipPresenter.userLogin(isAliPayInstalled())
} }
if (isDetail && UserManager.getInstance().newFlag) { // if (isDetail && UserManager.getInstance().newFlag) {
AppConfig.showVipAdDialog = true // AppConfig.showVipAdDialog = true
} // }
vipPresenter.orders() vipPresenter.orders()
...@@ -271,23 +271,23 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -271,23 +271,23 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
when (keyCode) { when (keyCode) {
KeyEvent.KEYCODE_BACK -> { KeyEvent.KEYCODE_BACK -> {
if (UserManager.getInstance().newFlag // if (UserManager.getInstance().newFlag
&& vipList != null && vipList!!.size > 0 // && vipList != null && vipList!!.size > 0
) { // ) {
//
vipAdapter.setPosition(0) // vipAdapter.setPosition(0)
vipAdapter.notifyDataSetChanged() // vipAdapter.notifyDataSetChanged()
val vipBean = vipList!![0] // val vipBean = vipList!![0]
if (vipBean.trial == 1) { // if (vipBean.trial == 1) {
ll_vip_alipay.visibility = View.VISIBLE // ll_vip_alipay.visibility = View.VISIBLE
ll_vip_wx.visibility = View.GONE // ll_vip_wx.visibility = View.GONE
payType = ALIPAY // payType = ALIPAY
iv_vip_alipay.setImageResource(R.mipmap.ic_vip_enable_blue) // iv_vip_alipay.setImageResource(R.mipmap.ic_vip_enable_blue)
iv_vip_wx.setImageResource(R.mipmap.ic_vip_none) // iv_vip_wx.setImageResource(R.mipmap.ic_vip_none)
} // }
backPayYesDialog(vipBean) // backPayYesDialog(vipBean)
return true // return true
} // }
finish() finish()
} }
...@@ -300,23 +300,23 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -300,23 +300,23 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
when (v?.id) { when (v?.id) {
R.id.ic_vip_quit -> { R.id.ic_vip_quit -> {
if (UserManager.getInstance().newFlag && // if (UserManager.getInstance().newFlag &&
vipList != null && vipList!!.size > 0 // vipList != null && vipList!!.size > 0
) { // ) {
vipAdapter.setPosition(0) // vipAdapter.setPosition(0)
vipAdapter.notifyDataSetChanged() // vipAdapter.notifyDataSetChanged()
val vipBean = vipList!![0] // val vipBean = vipList!![0]
if (vipBean.trial == 1) { // if (vipBean.trial == 1) {
ll_vip_alipay.visibility = View.VISIBLE // ll_vip_alipay.visibility = View.VISIBLE
ll_vip_wx.visibility = View.GONE // ll_vip_wx.visibility = View.GONE
payType = ALIPAY // payType = ALIPAY
iv_vip_alipay.setImageResource(R.mipmap.ic_vip_enable_blue) // iv_vip_alipay.setImageResource(R.mipmap.ic_vip_enable_blue)
iv_vip_wx.setImageResource(R.mipmap.ic_vip_none) // iv_vip_wx.setImageResource(R.mipmap.ic_vip_none)
} // }
backPayYesDialog(vipBean) // backPayYesDialog(vipBean)
} else { // } else {
finish() finish()
} // }
} }
R.id.tvVipPay -> { R.id.tvVipPay -> {
if (vipList != null && vipList!!.size > 0) { if (vipList != null && vipList!!.size > 0) {
......
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