Commit fdd79655 authored by wanglei's avatar wanglei

...

parent c27c0b82
...@@ -116,7 +116,7 @@ class MyApplication : BaseApplication() { ...@@ -116,7 +116,7 @@ class MyApplication : BaseApplication() {
LogEx.logDebug(TAG, "flag=$flag") LogEx.logDebug(TAG, "flag=$flag")
if (flag) { if (flag) {
if (AdmobOpenUtils.isOpenAdLoaded()) { if (AdmobMaxHelper.isOpenAdLoaded()) {
LogEx.logDebug(TAG, "show ad") LogEx.logDebug(TAG, "show ad")
AdmobMaxHelper.admobMaxShowOpenAd(activity) AdmobMaxHelper.admobMaxShowOpenAd(activity)
} else { } else {
......
...@@ -16,6 +16,14 @@ import com.base.datarecovery.utils.LogEx ...@@ -16,6 +16,14 @@ import com.base.datarecovery.utils.LogEx
object AdmobMaxHelper { object AdmobMaxHelper {
private val TAG = "" private val TAG = ""
fun isOpenAdLoaded(): Boolean {
return if (ConfigHelper.admobTrueMaxFlase) {
AdmobOpenUtils.isOpenAdLoaded()
} else {
AdMaxOpenUtils.isOpenAdLoaded()
}
}
fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) { fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) {
if (ConfigHelper.admobTrueMaxFlase) { if (ConfigHelper.admobTrueMaxFlase) {
AdmobInterstitialUtils.showInterstitialAd(activity) { AdmobInterstitialUtils.showInterstitialAd(activity) {
......
...@@ -32,11 +32,7 @@ object AdMaxInterstitialUtils { ...@@ -32,11 +32,7 @@ object AdMaxInterstitialUtils {
private fun setListener(activity: Activity) { private fun setListener(activity: Activity) {
if (interstitialAd == null) { if (interstitialAd == null) {
val reqId = UUID.randomUUID().toString()
val obj = JSONObject()
obj.put("req_id", reqId)
obj.put("ad_type", "interAd")
EventUtils.event("ad_pull_start", ext = obj)
interstitialAd = MaxInterstitialAd(ConfigHelper.interAdMaxId, activity) interstitialAd = MaxInterstitialAd(ConfigHelper.interAdMaxId, activity)
interstitialAd?.setListener(object : MaxAdListener { interstitialAd?.setListener(object : MaxAdListener {
override fun onAdLoaded(p0: MaxAd) { override fun onAdLoaded(p0: MaxAd) {
...@@ -44,11 +40,13 @@ object AdMaxInterstitialUtils { ...@@ -44,11 +40,13 @@ object AdMaxInterstitialUtils {
loadingListener?.invoke() loadingListener?.invoke()
interLoadTime = System.currentTimeMillis() interLoadTime = System.currentTimeMillis()
retryAttempt = 0 retryAttempt = 0
val reqId = UUID.randomUUID().toString()
AdMaxEvent.pullAd(p0, "interAd", reqId = reqId) AdMaxEvent.pullAd(p0, "interAd", reqId = reqId)
} }
override fun onAdLoadFailed(p0: String, p1: MaxError) { override fun onAdLoadFailed(p0: String, p1: MaxError) {
LogEx.logDebug(TAG, "onAdLoadFailed") LogEx.logDebug(TAG, "onAdLoadFailed")
val reqId = UUID.randomUUID().toString()
AdMaxEvent.pullAd(null, "interAd", reqId = reqId) AdMaxEvent.pullAd(null, "interAd", reqId = reqId)
AdDisplayUtils.getInstance().incrementAdRequestFailCount() AdDisplayUtils.getInstance().incrementAdRequestFailCount()
retryAttempt++ retryAttempt++
...@@ -169,6 +167,11 @@ object AdMaxInterstitialUtils { ...@@ -169,6 +167,11 @@ object AdMaxInterstitialUtils {
} }
if (AdMaxInit.isAdMaxInit.get()) { if (AdMaxInit.isAdMaxInit.get()) {
LogEx.logDebug(TAG, "loadInterstitialAd") LogEx.logDebug(TAG, "loadInterstitialAd")
val reqId = UUID.randomUUID().toString()
val obj = JSONObject()
obj.put("req_id", reqId)
obj.put("ad_type", "interAd")
EventUtils.event("ad_pull_start", ext = obj)
interstitialAd?.loadAd() interstitialAd?.loadAd()
} }
} }
......
...@@ -29,20 +29,20 @@ object AdMaxOpenUtils { ...@@ -29,20 +29,20 @@ object AdMaxOpenUtils {
LogEx.logDebug(TAG, "onAdLoaded") LogEx.logDebug(TAG, "onAdLoaded")
openLoadTime = System.currentTimeMillis() openLoadTime = System.currentTimeMillis()
loadingListener?.invoke() loadingListener?.invoke()
AdMaxEvent.pullAd(p0,"openAd") AdMaxEvent.pullAd(p0, "openAd")
} }
override fun onAdLoadFailed(p0: String, p1: MaxError) { override fun onAdLoadFailed(p0: String, p1: MaxError) {
LogEx.logDebug(TAG, "onAdLoadFailed:"+p1.message.toString()) LogEx.logDebug(TAG, "onAdLoadFailed:" + p1.message.toString())
onHidden?.invoke() onHidden?.invoke()
AdDisplayUtils.getInstance().incrementAdRequestFailCount() AdDisplayUtils.getInstance().incrementAdRequestFailCount()
AdMaxEvent.pullAd(null,"openAd") AdMaxEvent.pullAd(null, "openAd")
} }
override fun onAdDisplayed(p0: MaxAd) { override fun onAdDisplayed(p0: MaxAd) {
AdDisplayUtils.getInstance().incrementAdDisplayCount() AdDisplayUtils.getInstance().incrementAdDisplayCount()
AdMaxEvent.showAd(p0,"openAd",Activity()) AdMaxEvent.showAd(p0, "openAd", Activity())
} }
override fun onAdHidden(p0: MaxAd) { override fun onAdHidden(p0: MaxAd) {
...@@ -55,7 +55,7 @@ object AdMaxOpenUtils { ...@@ -55,7 +55,7 @@ object AdMaxOpenUtils {
AdDisplayUtils.getInstance().incrementAdClickCount() AdDisplayUtils.getInstance().incrementAdClickCount()
// com.base.datarecovery.ads.max.AdMaxEvent.clickAd(appOpenAd, "openAd") // com.base.datarecovery.ads.max.AdMaxEvent.clickAd(appOpenAd, "openAd")
AdmobCommonUtils.isMultiClick(appOpenAd) AdmobCommonUtils.isMultiClick(appOpenAd)
AdMaxEvent.clickAd(p0,"openAd") AdMaxEvent.clickAd(p0, "openAd")
} }
...@@ -71,7 +71,7 @@ object AdMaxOpenUtils { ...@@ -71,7 +71,7 @@ object AdMaxOpenUtils {
} }
}) })
appOpenAd?.setRevenueListener (AdMaxEvent.EventOnPaidEventListener()) appOpenAd?.setRevenueListener(AdMaxEvent.EventOnPaidEventListener())
} }
} }
...@@ -144,5 +144,9 @@ object AdMaxOpenUtils { ...@@ -144,5 +144,9 @@ object AdMaxOpenUtils {
} }
} }
fun isOpenAdLoaded(): Boolean {
return appOpenAd?.isReady == true
}
} }
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