...开屏广告

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

@@ -48,7 +48,7 @@ object AdmobMaxHelper {
                 onHidden?.invoke()
             }
         } else {
-            AdMaxOpenUtils.showAppOpenAd(activity, loaded = showBeforeAction) {
+            AdMaxOpenUtils.showAppOpenAd(activity, loadCallBack = showBeforeAction) {
                 onHidden?.invoke()
             }
         }

app/src/main/java/com/base/datarecovery/ads/max/AdMaxOpenUtils.kt

@@ -33,7 +33,7 @@ object AdMaxOpenUtils {
                     LogEx.logDebug(TAG, "广告拉取成功")
                     openLoadTime = System.currentTimeMillis()
                     loadingListener?.invoke()
-                    loadingListener=null
+                    loadingListener = null
                     AdMaxEvent.pullAd(p0, "openAd")
                 }
 
@@ -41,34 +41,25 @@ object AdMaxOpenUtils {
                     LogEx.logDebug(TAG, "广告拉取失败了，onAdLoadFailed:" + p1.message.toString())
                     LogEx.logDebug(TAG, "广告拉取失败了，onAdLoadFailed:" + p0)
                     LogEx.logDebug(TAG, "广告拉取失败了，onAdLoadFailed:" + p1.code)
+                    loadingListener?.invoke()
                     loadingListener = null
-                    onHidden?.invoke()
-                    onHidden = null
                     AdDisplayUtils.getInstance().incrementAdRequestFailCount()
                     val reqId = UUID.randomUUID().toString()
                     AdMaxEvent.pullAd(null, "openAd", reqId = reqId, error = p1.message, code = p1.code)
                 }
 
-
                 override fun onAdDisplayed(p0: MaxAd) {
                     AdDisplayUtils.getInstance().incrementAdDisplayCount()
                     AdMaxEvent.showAd(p0, "openAd", activityString)
                 }
 
                 override fun onAdHidden(p0: MaxAd) {
+                    LogEx.logDebug(TAG, "onAdHidden")
                     onHidden?.invoke()
                     onHidden = null
                     loadAppOpenAd(activity)
-                    loadingListener = null
                 }
 
-                override fun onAdClicked(p0: MaxAd) {
-                    AdDisplayUtils.getInstance().incrementAdClickCount()
-                    AdmobCommonUtils.isMultiClick(appOpenAd)
-                    AdMaxEvent.clickAd(p0, "openAd")
-                }
-
-
                 override fun onAdDisplayFailed(p0: MaxAd, p1: MaxError) {
                     LogEx.logDebug(TAG, "onAdDisplayFailed")
                     onHidden?.invoke()
@@ -80,6 +71,13 @@ object AdMaxOpenUtils {
                     obj.put("ad_unit", "openAd")
                     EventUtils.event("ad_show_error", ext = obj)
                 }
+
+                override fun onAdClicked(p0: MaxAd) {
+                    AdDisplayUtils.getInstance().incrementAdClickCount()
+                    AdmobCommonUtils.isMultiClick(appOpenAd)
+                    AdMaxEvent.clickAd(p0, "openAd")
+                }
+
             })
 
             appOpenAd?.setRevenueListener(AdMaxEvent.EventOnPaidEventListener())
@@ -88,7 +86,7 @@ object AdMaxOpenUtils {
 
     fun showAppOpenAd(
         activity: Activity,
-        loaded: (() -> Unit)? = null,
+        loadCallBack: (() -> Unit)? = null,
         onHidden: (() -> Unit)? = null
     ) {
 
@@ -123,10 +121,11 @@ object AdMaxOpenUtils {
         val obj1 = JSONObject()
         obj1.put("ad_unit", "openAd")
         EventUtils.event("ad_prepare_show", ext = obj1)
-        AdMaxOpenUtils.onHidden = onHidden
+
 
         if (appOpenAd?.isReady == true) {
             LogEx.logDebug(TAG, "广告准备好了，展示广告")
+            AdMaxOpenUtils.onHidden = onHidden
             appOpenAd?.showAd()
         } else {
             val obj = JSONObject()
@@ -134,26 +133,34 @@ object AdMaxOpenUtils {
             obj.put("ad_unit", "openAd")
             EventUtils.event("ad_show_error", ext = obj)
             LogEx.logDebug(TAG, "展示时候，发现广告需要拉取")
-            appOpenAd?.loadAd()
-            loadingListener = {
-                LogEx.logDebug(TAG, "loadingListener callback")
-                loaded?.invoke()
-                appOpenAd?.showAd()
-                loadingListener = null
+            val loaded = loadAppOpenAd(activity)
+            if (loaded) {
+                loadingListener = {
+                    loadCallBack?.invoke()
+                    LogEx.logDebug(TAG, "loadingListener callback")
+                    if (appOpenAd?.isReady == true) {
+                        appOpenAd?.showAd()
+                    } else {
+                        onHidden?.invoke()
+                    }
+                }
+            } else {
+                onHidden?.invoke()
             }
+
         }
     }
 
-    fun loadAppOpenAd(activity: Activity) {
+    fun loadAppOpenAd(activity: Activity): Boolean {
         setListener(activity)
 
         if (!AdDisplayUtils.getInstance().shouldShowAd("openAd")) {
             LogEx.logDebug(TAG, "!shouldShowAd")
-            return
+            return false
         }
         if (appOpenAd?.isReady == true) {
             LogEx.logDebug(TAG, "appOpenAd?.isReady == true")
-            return
+            return false
         }
 
         if (AdmobMaxHelper.isAdInit.get()) {
@@ -163,7 +170,9 @@ object AdMaxOpenUtils {
             obj.put("ad_type", "openAd")
             EventUtils.event("ad_pull_start", ext = obj)
             appOpenAd?.loadAd()
+            return true
         }
+        return false
     }
 
     fun isOpenAdLoaded(): Boolean {