...开屏

app/src/main/java/com/base/datarecovery/activity/SettingActivity.kt

@@ -3,13 +3,7 @@ package com.base.datarecovery.activity
 import android.content.Intent
 import android.graphics.Color
 import android.net.Uri
-import android.os.Bundle
 import androidx.activity.addCallback
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.base.datarecovery.R
 import com.base.datarecovery.bean.ConstObject.fcmNotification
 import com.base.datarecovery.bean.ConstObject.stayNotification
 import com.base.datarecovery.databinding.ActivitySettingBinding

app/src/main/java/com/base/datarecovery/activity/SplashActivity.kt

@@ -45,6 +45,8 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeout
+import java.util.concurrent.FutureTask
 import kotlin.random.Random
 import kotlin.random.nextLong
 
@@ -73,9 +75,6 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
         closeNotification()
 
         AdmobNativeUtils.loadNativeAd()
-        AdmobOpenUtils.loadAppOpenAd {
-            LogEx.logDebug(TAG, "load where=$it")
-        }
         AdmobInterstitialUtils.loadInterstitialAd(this)
 
         progressCollect()
@@ -196,29 +195,36 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
     }
 
     private var processTime = 0L
+    private var outTimeAdStart = false
     private fun startProgress() = lifecycleScope.launch {
         while (isActive) {
-
-            val value = binding.pb.progress + Random.nextInt(2, 5)
+            val value = binding.pb.progress + 2
             binding.pb.setProgress(value, true)
             progress.emit(value)
 
-            val delayTime = Random.nextLong(300, 550)
+            val delayTime = 300L
             delay(delayTime)
             processTime += delayTime
-            if (processTime >= Random.nextLong(4000, 6000)) {
-                job?.cancel()
-                outTimeAd()
+            if (processTime >= Random.nextLong(3000, 4000)) {
+                if (!outTimeAdStart) {
+                    outTimeAdStart = true
+                    outTimeAd()
+                }
             }
         }
     }
 
+
     private fun outTimeAd() {
-        AdmobOpenUtils.showAppOpenAd(this@SplashActivity) {
-            LogEx.logDebug(TAG, "where $it")
-            binding.pb.progress = 100
-            startActivity(Intent(this@SplashActivity, MainActivity::class.java))
-            finish()
+        LogEx.logDebug(TAG,"outTimeAd")
+        AdmobOpenUtils.loadAppOpenAd {
+            LogEx.logDebug(TAG, "load where=$it")
+            job?.cancel()
+            AdmobOpenUtils.showAppOpenAd(this@SplashActivity) {
+                LogEx.logDebug(TAG, "adCallBack=$it")
+                binding.pb.progress = 100
+                jumpNext()
+            }
         }
     }
 
@@ -234,4 +240,5 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
         job?.cancel()
     }
 
+
 }
\ No newline at end of file

app/src/main/java/com/base/datarecovery/activity/screenshot/ScreenShotActivity.kt

@@ -99,11 +99,11 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
         }
         onBackPressedDispatcher.addCallback {
             showExitFunctionDialog {
-                if (it){
+                if (it) {
                     AdmobInterstitialUtils.showInterstitialAd(this@ScreenShotActivity) {
                         finishToMain()
                     }
-                }else{
+                } else {
                     finishToMain()
                 }
 
@@ -136,6 +136,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
                             val split = screenShotAdapter.getAllData().sumOf { it.file.length() }.toFormatSize().split(" ")
                             binding.tvSize.text = split[0]
                             binding.tvUnit.text = split[1]
+                            setCleanUpUi(0)
                         }
                     }
                 }