Merge branch 'master' of gitlab.huolea.com:koko/data-recovery-white

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

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

@@ -71,6 +71,7 @@ object AdMaxInterstitialUtils {
                 override fun onAdHidden(p0: MaxAd) {
                     LogEx.logDebug(TAG, "onAdHidden")
                     onHidden?.invoke()
+                    AdMaxOpenUtils.loadAppOpenAd(activity)
                     loadInterstitialAd(activity)
                 }
 
@@ -116,16 +117,18 @@ object AdMaxInterstitialUtils {
             return
         }
 
+        LogEx.logDebug(TAG,"showInterstitialAd,展示插屏广告")
+
         val obj1 = JSONObject()
         obj1.put("ad_unit", "interAd")
         EventUtils.event("ad_prepare_show", ext = obj1)
 
         this.onHidden = onHidden
         if (interstitialAd?.isReady == true) {
-            LogEx.logDebug(TAG, "isReady=true")
+            LogEx.logDebug(TAG, "有缓存直接播放。")
             interstitialAd?.showAd(activity)
         } else {
-            LogEx.logDebug(TAG, "onAdDisplayFailed")
+            LogEx.logDebug(TAG, "展示广告时，没有缓存，需要拉取。")
             val obj2 = JSONObject()
             obj2.put("reason", "no ad")
             obj2.put("ad_unit", "interAd")

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

@@ -7,7 +7,6 @@ import com.applovin.mediation.MaxAdListener
 import com.applovin.mediation.MaxError
 import com.applovin.mediation.ads.MaxAppOpenAd
 import com.base.datarecovery.ads.AdDisplayUtils
-import com.base.datarecovery.ads.AdmobMaxHelper.isAdInit
 import com.base.datarecovery.ads.admob.AdmobCommonUtils
 import com.base.datarecovery.help.ConfigHelper
 import com.base.datarecovery.utils.EventUtils
@@ -21,23 +20,25 @@ object AdMaxOpenUtils {
     private var onHidden: (() -> Unit)? = null
     private var loadingListener: (() -> Unit)? = null
 
-    private fun setListener(context: Context) {
+    private fun setListener(context: Activity) {
         if (appOpenAd == null) {
             appOpenAd = MaxAppOpenAd(ConfigHelper.openAdMaxId, context)
 
             appOpenAd?.setListener(object : MaxAdListener {
                 override fun onAdLoaded(p0: MaxAd) {
-                    LogEx.logDebug(TAG, "onAdLoaded")
+                    LogEx.logDebug(TAG, "广告拉取成功")
                     openLoadTime = System.currentTimeMillis()
                     loadingListener?.invoke()
                     AdMaxEvent.pullAd(p0, "openAd")
                 }
 
                 override fun onAdLoadFailed(p0: String, p1: MaxError) {
-                    LogEx.logDebug(TAG, "onAdLoadFailed:" + p1.message.toString())
+                    LogEx.logDebug(TAG, "广告拉取失败了，onAdLoadFailed:" + p1.message.toString())
+                    LogEx.logDebug(TAG, "广告拉取失败了，onAdLoadFailed:" + p0)
+                    LogEx.logDebug(TAG, "广告拉取失败了，onAdLoadFailed:" + p1.code)
                     onHidden?.invoke()
                     AdDisplayUtils.getInstance().incrementAdRequestFailCount()
-                    AdMaxEvent.pullAd(null, "openAd", error = p1.message, code = p1.code)
+                    AdMaxEvent.pullAd(null, "openAd")
                 }
 
 
@@ -48,7 +49,7 @@ object AdMaxOpenUtils {
 
                 override fun onAdHidden(p0: MaxAd) {
                     onHidden?.invoke()
-                    appOpenAd?.loadAd()
+                    loadAppOpenAd(context)
                     loadingListener = null
                 }
 
@@ -63,7 +64,7 @@ object AdMaxOpenUtils {
                 override fun onAdDisplayFailed(p0: MaxAd, p1: MaxError) {
                     LogEx.logDebug(TAG, "onAdDisplayFailed")
                     onHidden?.invoke()
-                    appOpenAd?.loadAd()
+                    loadAppOpenAd(context)
                     val obj = JSONObject()
                     obj.put("code", p1.code)
                     obj.put("reason", p1.message)
@@ -99,22 +100,23 @@ object AdMaxOpenUtils {
             appOpenAd?.loadAd()
         }
 
-        if (!isAdInit.get()) {
+        if (!AdMaxInit.isAdMaxInit.get()) {
             onHidden?.invoke()
             return
         }
 
 
-        LogEx.logDebug(TAG, "showAppOpenAd continue")
+        LogEx.logDebug(TAG, "showAppOpenAd")
         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, "isReady=false")
+            LogEx.logDebug(TAG, "广告准备好了，展示广告")
             appOpenAd?.showAd()
         } else {
+            LogEx.logDebug(TAG, "展示时候，发现广告需要拉取")
             appOpenAd?.loadAd()
             loadingListener = {
                 LogEx.logDebug(TAG, "loadingListener callback")
@@ -133,12 +135,16 @@ object AdMaxOpenUtils {
             return
         }
         if (appOpenAd?.isReady == true) {
+            LogEx.logDebug(TAG, "appOpenAd?.isReady == true")
+
             return
         }
 
-        if (isAdInit.get()) {
-            LogEx.logDebug(TAG, "loadAppOpenAd")
+        if (AdMaxInit.isAdMaxInit.get()) {
+            LogEx.logDebug(TAG, "loadAppOpenAd2")
             appOpenAd?.loadAd()
+        } else {
+            LogEx.logDebug(TAG, "loadAppOpenAd3")
         }
     }