修改代码

app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/CleanJunkActivity.kt

@@ -24,6 +24,8 @@ import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ConfigHelper
 import com.test.easy.easycleanerjunk.helps.KotlinExt.toFormatSize
 import com.test.easy.easycleanerjunk.helps.MediaStoreUtils
+import com.test.easy.easycleanerjunk.helps.PermissionHelp.checkStorePermission
+import com.test.easy.easycleanerjunk.helps.PermissionHelp.requestStorePermission
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.helps.ads.AdsUtils
 import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
@@ -31,6 +33,7 @@ import com.test.easy.easycleanerjunk.utils.BarUtils
 import com.test.easy.easycleanerjunk.utils.SPUtils
 import com.test.easy.easycleanerjunk.view.AFunOb
 import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
+import com.test.easy.easycleanerjunk.view.DialogViews.showGerPermission
 import pokercc.android.expandablerecyclerview.ExpandableAdapter
 
 /**
@@ -80,7 +83,24 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
         binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
 
-        setAdapter()
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (checkStorePermission()) {
+            setAdapter()
+        } else {
+            dialog = showGerPermission(deny = { finishToMain() }) {
+                requestStorePermission(launcher, result = { flag ->
+                    if (flag) {
+                        setAdapter()
+                    } else {
+                        finishToMain()
+                    }
+                })
+            }
+        }
     }
 
     override fun initListener() {

app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/PrepareScanAt2.kt

@@ -2,7 +2,6 @@ package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.content.Intent
 import android.graphics.Color
-import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.activity.addCallback
@@ -10,11 +9,9 @@ import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutParepreScanBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
-import com.test.easy.easycleanerjunk.helps.PermissionHelp.checkStorePermission
-import com.test.easy.easycleanerjunk.helps.PermissionHelp.requestStorePermission
+import com.test.easy.easycleanerjunk.helps.ConfigHelper
 import com.test.easy.easycleanerjunk.helps.ads.AdsUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
-import com.test.easy.easycleanerjunk.view.DialogViews.showGerPermission
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -27,10 +24,10 @@ class PrepareScanAt2: BaseActivity<ActivityLayoutParepreScanBinding>() {
     }
     private var job: Job? = null
     override fun initView() {
-//        if(ConfigHelper.isInterAdShow){
-//            finish()
-//            return
-//        }
+        if(ConfigHelper.isInterAdShow){
+            finish()
+            return
+        }
         BarUtils.setStatusBarLightMode(this, true)
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
         binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
@@ -84,37 +81,39 @@ class PrepareScanAt2: BaseActivity<ActivityLayoutParepreScanBinding>() {
     }
     var isPlayAd=false
     private fun waitJob() = lifecycleScope.launch(Dispatchers.Main) {
-        if(isPlayAd){
-            Log.e("MXL", "waitJob: ", )
-            if (!checkStorePermission()) {
-                showGerPermission(
-                    deny = { finishToMain() },
-                    allow = {
-                        requestStorePermission(launcher, result = {
-                            if (it) {
-                                startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
-                                finish()
-                            } else {
-                                //finishToMain()
-                            }
-                        })
-                    })
-            }else{
-                Log.e("MXL", "给权限: ", )
-                startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
-                finish()
-            }
-        }else{
-            delay(5000)
-            binding.lottie.visibility = View.GONE
-            binding.lottieCompleted.visibility = View.VISIBLE
-            binding.lottieCompleted.playAnimation()
-            binding.idTv.text = "Completed!"
-            delay(1000)
-            isPlayAd=true
-            AdsUtils.showInterAds(this@PrepareScanAt2){
-                isPlayAd=true
-            }
+//        if(isPlayAd){
+//            if (!checkStorePermission()) {
+//                showGerPermission(
+//                    deny = { finishToMain() },
+//                    allow = {
+//                        requestStorePermission(launcher, result = {
+//                            if (it) {
+//                                startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
+//                                finish()
+//                            } else {
+//                                //finishToMain()
+//                            }
+//                        })
+//                    })
+//            }else{
+//                Log.e("MXL", "给权限: ", )
+//                startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
+//                finish()
+//            }
+//        }else{
+//
+//        }
+        delay(5000)
+        binding.lottie.visibility = View.GONE
+        binding.lottieCompleted.visibility = View.VISIBLE
+        binding.lottieCompleted.playAnimation()
+        binding.idTv.text = "Completed!"
+        delay(1000)
+      //  isPlayAd=true
+        AdsUtils.showInterAds(this@PrepareScanAt2){
+          //  isPlayAd=true
+            startActivity(Intent(this@PrepareScanAt2, CleanJunkActivity::class.java))
+            finish()
         }
     }