...

app/src/main/java/com/base/scanqr/ui/language/LanguageActivity.kt

@@ -27,6 +27,7 @@ class LanguageActivity : BaseActivity<ActivityLanguageBinding>(ActivityLanguageB
         super.initView()
         binding.clTop.updatePadding(top = BarUtils.getStatusBarHeight())
         isGuide = intent.extras?.getBoolean("isGuide") ?: isGuide
+        intent.extras?.clear()
         adapter = LanguageAdapter {
 
         }
@@ -55,7 +56,7 @@ class LanguageActivity : BaseActivity<ActivityLanguageBinding>(ActivityLanguageB
                 startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
                 finish()
             } else {
-                finish()
+                finishToMainTop()
             }
         }
         binding.flBack.setOnClickListener {
@@ -68,28 +69,31 @@ class LanguageActivity : BaseActivity<ActivityLanguageBinding>(ActivityLanguageB
             appLanguageSp = selectLanguageBean.language
             appLanguageCountrySp = selectLanguageBean.country
 
-//            if (isGuide) {
+
             AdsMgr.showInsert(this, true, object : AdsShowCallBack() {
                 override fun close(where: Int) {
-                    startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
+                    if (isGuide) {
+                        startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
+                    }
                     finish()
                 }
 
                 override fun failed(where: Int) {
-                    startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
+                    if (isGuide) {
+                        startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
+                    }
                     finish()
                 }
 
                 override fun googleFailed(where: Int) {
-                    startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
+                    if (isGuide) {
+                        startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
+                    }
                     finish()
                 }
             })
 //                startActivity(Intent(this@LanguageActivity, GuideActivity::class.java))
 //                finish()
-//            } else {
-//                finish()
-//            }
         }
     }
 

app/src/main/java/com/base/scanqr/ui/start/StartActivity.kt

@@ -201,9 +201,6 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i
         immersionBar {
             statusBarColor("#00FFFFFF")
             statusBarDarkFont(false)
-//            navigationBarDarkIcon(true)
-//            fitsSystemWindows(true)
-//            navigationBarColor("#FFFFFFFF")
         }
     }