Commit d0c59b3f authored by wanglei's avatar wanglei

...

parent 5c5b6aaf
...@@ -61,13 +61,7 @@ class MyApplication : BaseApplication() { ...@@ -61,13 +61,7 @@ class MyApplication : BaseApplication() {
ScreenStatusReceiver.setupScreenStatusListener(this) ScreenStatusReceiver.setupScreenStatusListener(this)
InstallHelps.init() InstallHelps.init()
if (ifAgreePrivacy) { if (ifAgreePrivacy) {
AdmobMaxHelper.initAdmobMaxAd()
if (ConfigHelper.admobTrueMaxFlase) {
MobileAds.initialize(this) { initializationStatus ->
}
} else {
initAdMax()
}
MainScope().launch(Dispatchers.Main) { MainScope().launch(Dispatchers.Main) {
val deferred = async(Dispatchers.IO) { val deferred = async(Dispatchers.IO) {
......
...@@ -8,14 +8,20 @@ import com.base.datarecovery.R ...@@ -8,14 +8,20 @@ import com.base.datarecovery.R
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils import com.base.datarecovery.ads.admob.AdmobInterstitialUtils
import com.base.datarecovery.ads.admob.AdmobNativeUtils import com.base.datarecovery.ads.admob.AdmobNativeUtils
import com.base.datarecovery.ads.admob.AdmobOpenUtils import com.base.datarecovery.ads.admob.AdmobOpenUtils
import com.base.datarecovery.ads.max.AdMaxInit.initAdMax
import com.base.datarecovery.ads.max.AdMaxInterstitialUtils import com.base.datarecovery.ads.max.AdMaxInterstitialUtils
import com.base.datarecovery.ads.max.AdMaxOpenUtils import com.base.datarecovery.ads.max.AdMaxOpenUtils
import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.help.ConfigHelper import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.google.android.gms.ads.MobileAds
import java.util.concurrent.atomic.AtomicBoolean
object AdmobMaxHelper { object AdmobMaxHelper {
private val TAG = "" private val TAG = ""
var isAdInit = AtomicBoolean(false)
fun isOpenAdLoaded(): Boolean { fun isOpenAdLoaded(): Boolean {
return if (ConfigHelper.admobTrueMaxFlase) { return if (ConfigHelper.admobTrueMaxFlase) {
AdmobOpenUtils.isOpenAdLoaded() AdmobOpenUtils.isOpenAdLoaded()
...@@ -63,4 +69,16 @@ object AdmobMaxHelper { ...@@ -63,4 +69,16 @@ object AdmobMaxHelper {
} }
} }
fun initAdmobMaxAd() {
if (ConfigHelper.admobTrueMaxFlase) {
if (!isAdInit.get()) {
MobileAds.initialize(BaseApplication.context) { initializationStatus ->
isAdInit.set(true)
}
}
} else {
BaseApplication.context.initAdMax()
}
}
} }
\ No newline at end of file
...@@ -4,6 +4,8 @@ import android.content.Context ...@@ -4,6 +4,8 @@ import android.content.Context
import com.applovin.sdk.AppLovinMediationProvider import com.applovin.sdk.AppLovinMediationProvider
import com.applovin.sdk.AppLovinSdk import com.applovin.sdk.AppLovinSdk
import com.applovin.sdk.AppLovinSdkInitializationConfiguration import com.applovin.sdk.AppLovinSdkInitializationConfiguration
import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.AdmobMaxHelper.isAdInit
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.google.android.gms.ads.identifier.AdvertisingIdClient import com.google.android.gms.ads.identifier.AdvertisingIdClient
import java.util.Collections import java.util.Collections
...@@ -13,10 +15,11 @@ import java.util.concurrent.atomic.AtomicBoolean ...@@ -13,10 +15,11 @@ import java.util.concurrent.atomic.AtomicBoolean
object AdMaxInit { object AdMaxInit {
private val TAG = "AdMaxInit" private val TAG = "AdMaxInit"
var isAdMaxInit = AtomicBoolean(false)
var maxInitAction: (() -> Unit)? = null var maxInitAction: (() -> Unit)? = null
fun Context.initAdMax() { fun Context.initAdMax() {
// If you want to test your own AppLovin SDK key, change the value here and update the package name in the build.gradle // If you want to test your own AppLovin SDK key, change the value here and update the package name in the build.gradle
val YOUR_SDK_KEY = "GGPreND6SRmCt1zJgn5faiLGD8c2PVGPLgPpSg7cHanVTud1DhtuI9MmteTqlEviaJ57WnxW68kQDaATJ5z3cW" val YOUR_SDK_KEY = "GGPreND6SRmCt1zJgn5faiLGD8c2PVGPLgPpSg7cHanVTud1DhtuI9MmteTqlEviaJ57WnxW68kQDaATJ5z3cW"
...@@ -36,7 +39,7 @@ object AdMaxInit { ...@@ -36,7 +39,7 @@ object AdMaxInit {
val sdk = AppLovinSdk.getInstance(this) val sdk = AppLovinSdk.getInstance(this)
sdk.initialize(initConfigBuilder.build()) { sdk.initialize(initConfigBuilder.build()) {
LogEx.logDebug(TAG, "max init") LogEx.logDebug(TAG, "max init")
isAdMaxInit.set(true) isAdInit.set(true)
maxInitAction?.invoke() maxInitAction?.invoke()
} }
......
...@@ -8,6 +8,8 @@ import com.applovin.mediation.MaxError ...@@ -8,6 +8,8 @@ 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.help.ConfigHelper import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.EventUtils import com.base.datarecovery.utils.EventUtils
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
...@@ -165,7 +167,7 @@ object AdMaxInterstitialUtils { ...@@ -165,7 +167,7 @@ object AdMaxInterstitialUtils {
if (interstitialAd?.isReady == true) { if (interstitialAd?.isReady == true) {
return return
} }
if (AdMaxInit.isAdMaxInit.get()) { if (isAdInit.get()) {
LogEx.logDebug(TAG, "loadInterstitialAd") LogEx.logDebug(TAG, "loadInterstitialAd")
val reqId = UUID.randomUUID().toString() val reqId = UUID.randomUUID().toString()
val obj = JSONObject() val obj = JSONObject()
......
...@@ -7,6 +7,7 @@ import com.applovin.mediation.MaxAdListener ...@@ -7,6 +7,7 @@ import com.applovin.mediation.MaxAdListener
import com.applovin.mediation.MaxError 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.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
...@@ -98,7 +99,7 @@ object AdMaxOpenUtils { ...@@ -98,7 +99,7 @@ object AdMaxOpenUtils {
appOpenAd?.loadAd() appOpenAd?.loadAd()
} }
if (!AdMaxInit.isAdMaxInit.get()) { if (!isAdInit.get()) {
onHidden?.invoke() onHidden?.invoke()
return return
} }
...@@ -135,12 +136,9 @@ object AdMaxOpenUtils { ...@@ -135,12 +136,9 @@ object AdMaxOpenUtils {
return return
} }
LogEx.logDebug(TAG, "loadAppOpenAd1") if (isAdInit.get()) {
if (AdMaxInit.isAdMaxInit.get()) { LogEx.logDebug(TAG, "loadAppOpenAd")
LogEx.logDebug(TAG, "loadAppOpenAd2")
appOpenAd?.loadAd() appOpenAd?.loadAd()
} else {
LogEx.logDebug(TAG, "loadAppOpenAd3")
} }
} }
......
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