Commit 1d6aaff5 authored by wanglei's avatar wanglei

...

parent aa36cb86
...@@ -8,6 +8,7 @@ import com.applovin.mediation.MaxError ...@@ -8,6 +8,7 @@ import com.applovin.mediation.MaxError
import com.applovin.mediation.ads.MaxInterstitialAd import com.applovin.mediation.ads.MaxInterstitialAd
import com.base.datarecovery.R import com.base.datarecovery.R
import com.base.datarecovery.ads.AdDisplayUtils import com.base.datarecovery.ads.AdDisplayUtils
import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.AdmobMaxHelper.isAdInit import com.base.datarecovery.ads.AdmobMaxHelper.isAdInit
import com.base.datarecovery.help.ConfigHelper import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.EventUtils import com.base.datarecovery.utils.EventUtils
...@@ -95,6 +96,11 @@ object AdMaxInterstitialUtils { ...@@ -95,6 +96,11 @@ object AdMaxInterstitialUtils {
return return
} }
if (!AdDisplayUtils.getInstance().shouldShowAd("interAd")) {
onHidden?.invoke()
return
}
if (isAdExpired()) { if (isAdExpired()) {
val obj2 = JSONObject() val obj2 = JSONObject()
obj2.put("ad_unit", "interAd") obj2.put("ad_unit", "interAd")
...@@ -105,11 +111,6 @@ object AdMaxInterstitialUtils { ...@@ -105,11 +111,6 @@ object AdMaxInterstitialUtils {
} }
if (!AdDisplayUtils.getInstance().shouldShowAd("interAd")) {
onHidden?.invoke()
return
}
LogEx.logDebug(TAG, "showInterstitialAd,展示插屏广告") LogEx.logDebug(TAG, "showInterstitialAd,展示插屏广告")
val obj1 = JSONObject() val obj1 = JSONObject()
...@@ -182,6 +183,8 @@ object AdMaxInterstitialUtils { ...@@ -182,6 +183,8 @@ object AdMaxInterstitialUtils {
EventUtils.event("ad_pull_start", ext = obj) EventUtils.event("ad_pull_start", ext = obj)
interstitialAd?.loadAd() interstitialAd?.loadAd()
return true return true
} else {
EventUtils.event("isAdInit", value = "loadInterstitialAd isAdInit=${isAdInit.get()}")
} }
return false return false
} }
......
...@@ -7,6 +7,7 @@ import com.applovin.mediation.MaxError ...@@ -7,6 +7,7 @@ import com.applovin.mediation.MaxError
import com.applovin.mediation.ads.MaxAppOpenAd import com.applovin.mediation.ads.MaxAppOpenAd
import com.base.datarecovery.ads.AdDisplayUtils import com.base.datarecovery.ads.AdDisplayUtils
import com.base.datarecovery.ads.AdmobMaxHelper import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.AdmobMaxHelper.isAdInit
import com.base.datarecovery.ads.admob.AdmobCommonUtils import com.base.datarecovery.ads.admob.AdmobCommonUtils
import com.base.datarecovery.help.ConfigHelper import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.EventUtils import com.base.datarecovery.utils.EventUtils
...@@ -110,7 +111,8 @@ object AdMaxOpenUtils { ...@@ -110,7 +111,8 @@ object AdMaxOpenUtils {
appOpenAd?.loadAd() appOpenAd?.loadAd()
} }
if (!AdmobMaxHelper.isAdInit.get()) { if (!isAdInit.get()) {
EventUtils.event("isAdInit", value = "showAppOpenAd isAdInit=${isAdInit.get()}")
onHidden?.invoke() onHidden?.invoke()
return return
} }
...@@ -163,7 +165,8 @@ object AdMaxOpenUtils { ...@@ -163,7 +165,8 @@ object AdMaxOpenUtils {
return false return false
} }
if (AdmobMaxHelper.isAdInit.get()) { if (isAdInit.get()) {
EventUtils.event("isAdInit", value = "loadAppOpenAd isAdInit=${isAdInit.get()}")
LogEx.logDebug(TAG, "appOpenAd loadAd") LogEx.logDebug(TAG, "appOpenAd loadAd")
val reqId = UUID.randomUUID().toString() val reqId = UUID.randomUUID().toString()
val obj = JSONObject() val obj = JSONObject()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment