Commit efdc821d authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 59582ea3
......@@ -10,8 +10,8 @@ android {
applicationId "com.duben.heliapp"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 729
versionName "7.2.9"
versionCode 730
versionName "7.3.0"
flavorDimensions "default"
// dex突破65535的限制
......
......@@ -153,13 +153,14 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
if (isFinishing) return
// false-登录 true-绑定手机号
showToast("绑定成功")
showToast("操作成功")
hideLoading()
Handler(Looper.getMainLooper()).postDelayed({
readyGoThenKill(MainActivity::class.java)
}, 1000)
// Handler(Looper.getMainLooper()).postDelayed({
// readyGoThenKill(MainActivity::class.java)
// }, 1000)
finish()
}
override fun sendCodeSuc() {
......
......@@ -300,15 +300,16 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
// readyGoThenKill(MainActivity::class.java)
// }
// }
if (!UserManager.getInstance().userIsLogin()) {
val b = Bundle()
b.putString(MobileLoginActivity.TYPE, "vip")
readyGoThenKill(MobileLoginActivity::class.java, b)
} else {
// if (!UserManager.getInstance().userIsLogin()) {
// val b = Bundle()
// b.putString(MobileLoginActivity.TYPE, "vip")
// readyGoThenKill(MobileLoginActivity::class.java, b)
// } else {
// readyGoThenKill(MainActivity::class.java)
// }
readyGoThenKill(MainActivity::class.java)
}
}
}
override fun getUserSuc(data: UserBean) {
if (data.expireTime > 0) {
......@@ -380,6 +381,13 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
}
}
R.id.tvVipPay -> {
if (UserManager.getInstance().userIsLogin()) {
showToast("请先登录")
readyGo(MobileLoginActivity::class.java)
return
}
if (vipList != null && vipList!!.size > 0) {
val vipBean = vipList!![vipAdapter.getPosition()]
......
......@@ -45,7 +45,8 @@ RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
RELEASE_TALKING_DATA_KEY="953575B247E8445090F9823ED5EB6497"
GROMORE_APP_ID="5459207"
#GROMORE_APP_ID="5459207"
GROMORE_APP_ID="1234567"
GROMORE_SPLASH_CODE="102590944"
GROMORE_VIDEO_CODE="103251251"
GROMORE_EXPRESS_CODE="103250982"
......
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