Commit c690966b authored by mengcuiguang2's avatar mengcuiguang2

代码优化

parent 0101a915
......@@ -15,8 +15,8 @@ android {
applicationId "com.duben.loveplayletd"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 806
versionName "8.0.6"
versionCode 807
versionName "8.0.7"
flavorDimensions "default"
// dex突破65535的限制
......
......@@ -98,29 +98,40 @@ class SplashActivity : BaseActivity() {
get().put(Constant.FIRST_SPLASH, false)
}
if (!isFinishing) {
if (isAdSuc) return
if (SplashManager.isSuccessStatus()) {
LogUtil.d("SplashNewActivity-->", "SplashNewActivity--> ad show")
isAdSuc = true
if (mProgressBar != null) {
mProgressBar!!.setCompleteNoAnim()
}
// 跳转广告
readyGoThenKill(SplashAdActivity::class.java)
}
}
// if (!isFinishing) {
// if (isAdSuc) return
//
// if (SplashManager.isSuccessStatus()) {
// LogUtil.d("SplashNewActivity-->", "SplashNewActivity--> ad show")
// isAdSuc = true
// if (mProgressBar != null) {
// mProgressBar!!.setCompleteNoAnim()
// }
// // 跳转广告
// readyGoThenKill(SplashAdActivity::class.java)
// }
// }
}
override fun onFinish() {
if (isAdSuc) return
// if (!isFinishing) {
// if (mProgressBar != null) {
// mProgressBar!!.setCompleteNoAnim()
// }
// goToMainActivity()
// }
if (!isFinishing) {
if (mProgressBar != null) {
mProgressBar!!.setCompleteNoAnim()
}
goToMainActivity()
if (SplashManager.isSuccessStatus()) {
LogUtil.d("SplashNewActivity-->", "SplashNewActivity--> onFinish")
// 跳转广告
readyGoThenKill(SplashAdActivity::class.java)
}else{
goToMainActivity()
}
}
}
})
......@@ -150,8 +161,8 @@ class SplashActivity : BaseActivity() {
return if (keyCode == KeyEvent.KEYCODE_BACK) {
true
} else super.onKeyDown(
keyCode,
event
keyCode,
event
)
}
......@@ -195,9 +206,10 @@ class SplashActivity : BaseActivity() {
if (powerDialog != null && powerDialog!!.isShowing) {
powerDialog!!.dismiss()
}
TrackManager.getInstance().visitorlogin()
get().put(Constant.LOAN_PERMISSION_FLAG, false)
baseApplication.thirdConfig()
TrackManager.getInstance().visitorlogin()
initData()
}
}
......@@ -238,9 +250,10 @@ class SplashActivity : BaseActivity() {
if (powerDialog2 != null && powerDialog2!!.isShowing) {
powerDialog2!!.dismiss()
}
TrackManager.getInstance().visitorlogin()
get().put(Constant.LOAN_PERMISSION_FLAG, false)
baseApplication.thirdConfig()
TrackManager.getInstance().visitorlogin()
initData()
}
}
......
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