...

app/src/main/java/com/base/browserwhite/ads/AdmobMaxHelper.kt

@@ -25,6 +25,8 @@ object AdmobMaxHelper {
     var isBlack: Boolean = false
     var isInterOpenShowing: Boolean = false
 
+    var lastShowInter = 0L
+
     private fun getSpAdmobTrueMaxFalse(): Boolean {
         val ss = AppPreferences.getInstance().getString("admobTrueMaxFalse", "1").toInt()
         return ss == 1
@@ -66,32 +68,32 @@ object AdmobMaxHelper {
 
     //展示广告关闭时赋值
     var lastShowedOnHiddenTime = 0L
-    fun admobMaxShowInterstitialAd(activity: Activity, isLoading: Boolean = true, onHidden: (() -> Unit)? = null) {
+    fun admobMaxShowInterstitialAd(activity: Activity, isLoading: Boolean = true, onHidden: ((showed: Boolean) -> Unit)? = null) {
         if (isBlack) {
             EventUtils.event("ad_black", "interAd")
-            onHidden?.invoke()
+            onHidden?.invoke(false)
             return
         }
         val isShowLoadingAd = AppPreferences.getInstance().getString("isShowLoadingAd", "0").toInt()
         if (isShowLoadingAd == 0 && isLoading) {
             EventUtils.event("ad_switch_close")
-            onHidden?.invoke()
+            onHidden?.invoke(false)
             return
         }
         val adInterval = AppPreferences.getInstance().getString("adInterval", "0").toInt()
         if ((System.currentTimeMillis() - lastShowedOnHiddenTime) < adInterval * 1000 && lastShowedOnHiddenTime != 0L) {
-            onHidden?.invoke()
+            onHidden?.invoke(false)
             EventUtils.event("ad_interval")
             return
         }
 
         if (getSpAdmobTrueMaxFalse()) {
             AdmobInterstitialUtils.showInterstitialAd(activity) {
-                onHidden?.invoke()
+                onHidden?.invoke(it)
             }
         } else {
             AdMaxInterstitialUtils.showInterstitialAd(activity) {
-                onHidden?.invoke()
+                onHidden?.invoke(true)
             }
         }
     }

app/src/main/java/com/base/browserwhite/ads/admob/AdmobInterstitialUtils.kt

@@ -40,7 +40,7 @@ object AdmobInterstitialUtils {
         activity: Activity,
         isReLoadAd: Boolean = false,
         isShowDialog: Boolean = true,
-        onHidden: (() -> Unit)? = null
+        onHidden: ((showed: Boolean) -> Unit)? = null
     ) {
 
         if (activity.isFinishing || activity.isDestroyed) {
@@ -56,12 +56,12 @@ object AdmobInterstitialUtils {
             EventUtils.event("ad_expire", ext = obj2)
             interAd = null
             loadInterstitialAd(activity)
-            onHidden?.invoke()
+            onHidden?.invoke(false)
             return
         }
 
         if (!AdDisplayUtils.getInstance().shouldShowAd("interAd")) {
-            onHidden?.invoke()
+            onHidden?.invoke(false)
             return
         }
 
@@ -118,10 +118,10 @@ object AdmobInterstitialUtils {
         activity: Activity,
         isReLoadAd: Boolean,
         isShowDialog: Boolean,
-        onHidden: (() -> Unit)?
+        onHidden: ((showed: Boolean) -> Unit)?
     ) {
         if (!isShowDialog) {
-            onHidden?.invoke()
+            onHidden?.invoke(false)
             return
         }
         var mDialog: Dialog? = null
@@ -136,17 +136,17 @@ object AdmobInterstitialUtils {
             mDialog?.dismiss()
             if (!isReLoadAd) {
                 showInterstitialAd(activity, true, false) {
-                    onHidden?.invoke()
+                    onHidden?.invoke(it)
                 }
             }
         }
         if (isReLoadAd) {
             mDialog?.dismiss()
-            onHidden?.invoke()
+            onHidden?.invoke(false)
         }
     }
 
-    private fun displayInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) {
+    private fun displayInterstitialAd(activity: Activity, onHidden: ((showed: Boolean) -> Unit)? = null) {
         val thisInterAd = interAd
         interAd = null
         thisInterAd?.fullScreenContentCallback = object : FullScreenContentCallback() {
@@ -157,14 +157,14 @@ object AdmobInterstitialUtils {
 
             override fun onAdDismissedFullScreenContent() {
                 interAd = null
-                onHidden?.invoke()
+                onHidden?.invoke(true)
                 loadInterstitialAd(activity)
                 lastShowedOnHiddenTime = System.currentTimeMillis()
             }
 
             override fun onAdFailedToShowFullScreenContent(p0: AdError) {
                 interAd = null
-                onHidden?.invoke()
+                onHidden?.invoke(false)
                 loadInterstitialAd(activity)
             }
 

app/src/main/java/com/base/browserwhite/ui/activity/cleanjunk/CleaningActivity.kt

@@ -12,6 +12,7 @@ import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER
 import com.base.browserwhite.databinding.ActivityLayoutCleanupingBinding
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.activity.result.ResultActivity
+import com.base.browserwhite.utils.AppPreferences
 import com.base.browserwhite.utils.BarUtils
 import com.base.browserwhite.utils.MediaStoreUtils.updateMediaStore
 import kotlinx.coroutines.Dispatchers
@@ -79,23 +80,22 @@ class CleaningActivity : BaseActivity<ActivityLayoutCleanupingBinding>() {
                 binding.idTvJd.text = "${it.animatedValue as Int}"
             }
             doOnEnd {
-//                val isCleanEndAdSp = AppPreferences.getInstance().getString("isCleanEndAdSp", "0").toInt()
-
-//                if (isCleanEndAdSp == 1) {
-//                    com.base.browserwhite.ads.AdmobMaxHelper.admobMaxShowInterstitialAd(this@CleaningActivity) {
-//                        startActivity(
-//                            Intent(this@CleaningActivity, ResultActivity::class.java).putExtra("from", JUNK_CLEANER)
-//                                .putExtra("clean_size", intentSize)
-//                        )
-//                        finish()
-//                    }
-//                } else {
-                startActivity(
-                    Intent(this@CleaningActivity, ResultActivity::class.java).putExtra("from", JUNK_CLEANER)
-                        .putExtra("clean_size", intentSize)
-                )
-                finish()
-//                }
+                val isCleanEndAdSp = AppPreferences.getInstance().getString("isCleanEndAdSp", "1").toInt()
+                if (isCleanEndAdSp == 1) {
+                    com.base.browserwhite.ads.AdmobMaxHelper.admobMaxShowInterstitialAd(this@CleaningActivity) {
+                        startActivity(
+                            Intent(this@CleaningActivity, ResultActivity::class.java).putExtra("from", JUNK_CLEANER)
+                                .putExtra("clean_size", intentSize)
+                        )
+                        finish()
+                    }
+                } else {
+                    startActivity(
+                        Intent(this@CleaningActivity, ResultActivity::class.java).putExtra("from", JUNK_CLEANER)
+                            .putExtra("clean_size", intentSize)
+                    )
+                    finish()
+                }
             }
             start()
         }

app/src/main/java/com/base/browserwhite/ui/activity/cleanjunk/ScanJunkActivity.kt

@@ -17,6 +17,7 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import com.base.browserwhite.MyApplication
 import com.base.browserwhite.R
+import com.base.browserwhite.ads.AdmobMaxHelper
 import com.base.browserwhite.bean.ChildBean
 import com.base.browserwhite.bean.ConstObject
 import com.base.browserwhite.bean.ParentBean
@@ -89,7 +90,9 @@ class ScanJunkActivity : BaseActivity<ActivityScanJunkBinding>() {
         super.initListener()
 
         onBackPressedDispatcher.addCallback {
-            finishToMain()
+            AdmobMaxHelper.admobMaxShowInterstitialAd(this@ScanJunkActivity, false) {
+                finishToMain()
+            }
         }
         binding.flFanhui.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()

app/src/main/java/com/base/browserwhite/ui/activity/download/WebDownloadManagerActivity.kt

@@ -6,6 +6,7 @@ import androidx.activity.addCallback
 import androidx.core.content.FileProvider
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import com.base.browserwhite.ads.AdmobMaxHelper
 import com.base.browserwhite.bean.DownloadBean
 import com.base.browserwhite.databinding.ActivityWebDownloadManagerBinding
 import com.base.browserwhite.ui.activity.BaseActivity
@@ -108,7 +109,9 @@ class WebDownloadManagerActivity : BaseActivity<ActivityWebDownloadManagerBindin
     override fun initListener() {
         super.initListener()
         onBackPressedDispatcher.addCallback {
-            finishToMain()
+            AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebDownloadManagerActivity, false) {
+                finishToMain()
+            }
         }
         binding.flFanhui.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()

app/src/main/java/com/base/browserwhite/ui/activity/mediabrowser/MediaImageDetailActivity.kt

@@ -4,6 +4,7 @@ import android.graphics.Color
 import android.net.Uri
 import androidx.activity.addCallback
 import androidx.core.view.updatePadding
+import com.base.browserwhite.ads.AdmobMaxHelper
 import com.base.browserwhite.databinding.ActivityMediaImageDetailBinding
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.views.DialogViews.showDeleteTipDialog
@@ -39,7 +40,9 @@ class MediaImageDetailActivity : BaseActivity<ActivityMediaImageDetailBinding>()
     override fun initListener() {
         super.initListener()
         onBackPressedDispatcher.addCallback {
-            finish()
+            AdmobMaxHelper.admobMaxShowInterstitialAd(this@MediaImageDetailActivity, false) {
+                finish()
+            }
         }
         binding.ivFanhui.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
 

app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt

@@ -10,6 +10,8 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import com.base.browserwhite.R
+import com.base.browserwhite.ads.AdmobMaxHelper
+import com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
 import com.base.browserwhite.bean.ConstObject
 import com.base.browserwhite.bean.ConstObject.GOOGLE
 import com.base.browserwhite.databinding.ActivityWebBrowserBinding
@@ -35,11 +37,14 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
     private var currentFragment: WebViewFragment? = null
     private var searchAction: (context: String) -> String = ::getBaiduSearch
 
+    var from: String = ""
+
     override fun initView() {
         BarUtils.setStatusBarLightMode(this, true)
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
         binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
 
+        from = intent.extras?.getString("from") ?: ""
         val url = intent.extras?.getString("url") ?: ""
         binding.editWeb.setText(url)
 
@@ -125,7 +130,23 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
             if (currentFragment?.canGoBack() == true) {
                 currentFragment?.goBack()
             } else {
-                finishToMain()
+                when (from) {
+
+                    "WevStoreActivity" -> {
+
+                        if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) {
+                            AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebBrowserActivity, false) {
+                                lastShowInter = System.currentTimeMillis()
+                                finishToMain()
+                            }
+                        }
+
+
+                    }
+
+                    else -> finishToMain()
+                }
+
             }
         }
         binding.ivLeft.setOnClickListener {
@@ -164,7 +185,7 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
 
                     ConstObject.YANDEX -> {
                         binding.ivSearchEngine.setImageResource(R.mipmap.h_s_yandex)
-                        searchAction =::getYandexSearch
+                        searchAction = ::getYandexSearch
                     }
 
                     ConstObject.BAIDU -> {

app/src/main/java/com/base/browserwhite/ui/activity/webstore/WevStoreActivity.kt

@@ -45,6 +45,8 @@ class WevStoreActivity : BaseActivity<ActivityWevStoreBinding>() {
         adapter = WebSiteGroupAdapter(clickAction = { bean ->
             startActivity(Intent(this, WebBrowserActivity::class.java).apply {
                 putExtra("url", bean.url)
+                putExtra("from", "WevStoreActivity")
+
             })
             finish()
         })