...

app/src/main/java/com/base/datarecovery/activity/privacyspace/PrivacyManageActivity.kt

@@ -110,9 +110,11 @@ class PrivacyManageActivity : BaseActivity<ActivityPrivacyManageBinding>() {
             LogEx.logDebug(TAG, "$it")
             list.add(MediaBean(it.absolutePath))
         }, onFinish = {
-            if (list.isNotEmpty()) {
-                binding.rv.visibility = View.VISIBLE
-                mediaSubAdapter.setData(list)
+            lifecycleScope.launch(Dispatchers.Main) {
+                if (list.isNotEmpty()) {
+                    binding.rv.visibility = View.VISIBLE
+                    mediaSubAdapter.setData(list)
+                }
             }
         })
     }

app/src/main/java/com/base/datarecovery/activity/recovery/FileScanResultActivity.kt

@@ -6,7 +6,6 @@ import android.graphics.Color
 import android.os.Environment
 import androidx.activity.addCallback
 import androidx.lifecycle.lifecycleScope
-import com.base.datarecovery.R
 import com.base.datarecovery.adapter.FileFolderAdapter
 import com.base.datarecovery.ads.AdmobInterstitialUtils
 import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
@@ -144,7 +143,6 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
         )
         val foundFlow: SharedFlow<Pair<Int, String>> = mFoundFlow
 
-
         val dialogClass = FileScanDialog(this)
         val scanDialog = dialogClass.showFileScanDialog(pathFlow, foundFlow)
 
@@ -158,13 +156,14 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
         val pathList = ArrayList<String>()
         lifecycleScope.launch(Dispatchers.Main) {
             mFoundFlow.collectLatest {
+                dialogClass.scanShowUI()
                 pathList.add(it.second)
                 binding.tvFileNumber.text = pathList.size.toString()
                 setAdapterData(pathList)
             }
         }
 
-        var oneShowAd = false
+
         val root = Environment.getExternalStorageDirectory()
         lifecycleScope.loadFileByFilter(
             mPathFlow,
@@ -172,16 +171,15 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
             root, filter = filter,
             onDo = { file ->
                 LogEx.logDebug(TAG, "file =${file.absolutePath}")
-                if (!oneShowAd) {
-                    oneShowAd = true
-                    lifecycleScope.launch(Dispatchers.Main) {
-                        dialogClass.scanShowUI()
-                        AdmobInterstitialUtils.showInterstitialAd(this@FileScanResultActivity, true, false) { }
-                    }
-                }
             },
             onFinish = {
-                scanDialog.dismiss()
+                lifecycleScope.launch(Dispatchers.Main) {
+                    dialogClass.finishScan {
+                        AdmobInterstitialUtils.showInterstitialAd(this@FileScanResultActivity) {
+                            scanDialog.dismiss()
+                        }
+                    }
+                }
             }
         )
 

app/src/main/java/com/base/datarecovery/fragment/PrivacyPageFragment.kt

@@ -18,6 +18,8 @@ import com.base.datarecovery.utils.LogEx
 import com.base.datarecovery.view.DialogViews.showCameraSettingDialog
 import com.base.datarecovery.view.DialogViews.showGerPermission
 import com.base.datarecovery.view.DialogViews.showImageImportDialog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.io.File
 import kotlin.random.Random
 
@@ -114,14 +116,16 @@ class PrivacyPageFragment(
                 list.add(it.absolutePath)
             },
             onFinish = {
-                if (list.isNotEmpty()) {
-                    binding.llEmpty.visibility = View.GONE
-                    binding.rv.visibility = View.VISIBLE
-                    binding.ivAdd.visibility = View.VISIBLE
-                    binding.tvManager.visibility = View.VISIBLE
+                lifecycleScope.launch(Dispatchers.Main) {
+                    if (list.isNotEmpty()) {
+                        binding.llEmpty.visibility = View.GONE
+                        binding.rv.visibility = View.VISIBLE
+                        binding.ivAdd.visibility = View.VISIBLE
+                        binding.tvManager.visibility = View.VISIBLE
+                    }
+                    adapter.setData(list)
+                    callback?.invoke()
                 }
-                adapter.setData(list)
-                callback?.invoke()
             })
     }
 }
\ No newline at end of file

app/src/main/java/com/base/datarecovery/help/FileHelp.kt

@@ -67,9 +67,7 @@ object FileHelp {
                 }
             }
         }
-        launch(Dispatchers.Main) {
-            onFinish?.invoke()
-        }
+        onFinish?.invoke()
     }
 
     fun readFileRange(filePath: String, start: Long, end: Long): ByteArray {

app/src/main/java/com/base/datarecovery/view/FileScanDialog.kt

@@ -69,23 +69,18 @@ class FileScanDialog(
             }
         }
 
-
         return dialog
     }
 
     @SuppressLint("SetTextI18n")
-    fun stopScan(scanType: Int, pathList: ArrayList<String>) {
+    fun finishScan(clickAction: () -> Unit) {
         a1.cancel()
         binding.tvBtn.visibility = View.VISIBLE
         binding.iv.visibility = View.GONE
         binding.tvPath.visibility = View.GONE
         binding.tvTitle.text = "Scan Completed"
         binding.tvBtn.setOnClickListener {
-            activity.startActivity(Intent(activity, FileScanResultActivity::class.java).apply {
-                putExtra("ScanType", scanType)
-                putExtra("PathList", pathList.toTypedArray())
-            })
-            activity.finish()
+            clickAction.invoke()
         }
     }