Commit df8b108d authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 7848bdb3
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.duben.speedplaylet" applicationId "com.duben.speedplaylet"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 3 versionCode 4
versionName "1.0.2" versionName "1.0.3"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -507,11 +507,11 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -507,11 +507,11 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} }
when (v.id) { when (v.id) {
R.id.iv_dialog_vip_quit -> { R.id.iv_dialog_vip_quit -> {
if (isGuide) { // if (isGuide) {
readyGoThenKill(MainActivity::class.java) // readyGoThenKill(MainActivity::class.java)
} else { // } else {
finish() // finish()
} // }
} }
R.id.tv_dialog_vip_next -> { R.id.tv_dialog_vip_next -> {
cbVipAgreement.isChecked = true cbVipAgreement.isChecked = true
......
...@@ -90,15 +90,25 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR ...@@ -90,15 +90,25 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
* 跳转到主页面 * 跳转到主页面
*/ */
private fun goToMainActivity() { private fun goToMainActivity() {
val firstVedio = AppPreferencesManager.get().getBoolean(Constant.IS_FIRST_VEDIO, false) // val firstVedio = AppPreferencesManager.get().getBoolean(Constant.IS_FIRST_VEDIO, false)
if (firstVedio) { // if (firstVedio) {
if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) { // if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
homePresenter.getRecommendVedio() // homePresenter.getRecommendVedio()
//
// val bundle = Bundle()
// bundle.putBoolean(VipActivity.IS_MAIN, true)
// readyGo(VipActivity::class.java, bundle)
// }
// } else {
// homePresenter.getSoltVedio()
// }
val bundle = Bundle() if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
bundle.putBoolean(VipActivity.IS_MAIN, true) homePresenter.getRecommendVedio()
readyGo(VipActivity::class.java, bundle)
} val bundle = Bundle()
bundle.putBoolean(VipActivity.IS_MAIN, true)
readyGo(VipActivity::class.java, bundle)
} else { } else {
homePresenter.getSoltVedio() homePresenter.getSoltVedio()
} }
......
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