Merge branch 'free-master' of gitlab.huolea.com:koko/easy-junk-cleaner-6-18 into free-master

app/src/main/java/com/test/easy/easycleanerjunk/helps/ads/AdmobUtils.kt

@@ -314,30 +314,32 @@ object AdmobUtils {
         }
     }
 
-    private fun showIntervalDialogAndShowAd(
-        activity: Activity,
-        isLoadAdNow: Boolean,
-        onHidden: (() -> Unit)?,
-        interval: Int
-    ) {
-        val customDialog = CustomDialog(activity, R.layout.dialog_ad_loading)
-        customDialog.setCountdownText(R.id.dialog_ad_loading_text)
+    private var customDialog: CustomDialog? = null
+
+    private fun showIntervalDialogAndShowAd(activity: Activity, isLoadAdNow: Boolean, onHidden: (() -> Unit)?, interval: Int) {
+        if (customDialog != null && customDialog?.isShowing == true) {
+            return  // 如果对话框已经显示，则不再显示
+        }
+
+        customDialog = CustomDialog(activity, R.layout.dialog_ad_loading)
+        customDialog?.setCountdownText(R.id.dialog_ad_loading_text)
         val countdownTimer = object : CountDownTimer((interval * 1000).toLong(), 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 val seconds = (millisUntilFinished / 1000).toInt()
-                customDialog.updateCountdownText("Advertising in preparation ($seconds" + "s)...")
+                customDialog?.updateCountdownText("Advertising in preparation ($seconds" + "s)...")
             }
 
             override fun onFinish() {
                 showCachedInterstitialAd(activity, isLoadAdNow, onHidden)
                 customDialog?.dismiss()
-                customDialog.dismiss()
+                customDialog = null
             }
         }
         countdownTimer.start()
-        customDialog.show()
+        customDialog?.show()
     }
 
+
     private fun showCachedInterstitialAd(
             activity: Activity,
             isLoadAdNow: Boolean,
@@ -363,8 +365,12 @@ object AdmobUtils {
             onHidden: (() -> Unit)?
     ) {
         var mDialog: Dialog? = null
+        if (!activity.isFinishing && !activity.isDestroyed) {
             mDialog = CustomDialog(activity, R.layout.dialog_ad_loading)
-        mDialog.show()
+            // 设置对话框的样式和内容
+            mDialog?.show()
+        }
+
 
         loadInterstitialAd(activity) {
             mDialog?.dismiss()