Commit 79c9e404 authored by wanglei's avatar wanglei

...

parent 79a385cd
......@@ -62,7 +62,7 @@ object AdmobInterstitialUtils {
val obj1 = JSONObject()
obj1.put("ad_unit", "interAd")
EventUtils.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show_inter", ext = obj1)
if (interAd != null) {
var dialog: Dialog? = null
......@@ -185,4 +185,8 @@ object AdmobInterstitialUtils {
}
thisInterAd?.show(activity)
}
fun haveReadAd(): Boolean {
return interAd!=null
}
}
\ No newline at end of file
......@@ -30,6 +30,10 @@ object AdmobOpenUtils {
return System.currentTimeMillis() - openLoadTime > 1000 * 60 * 60
}
fun haveReadAd(): Boolean {
return mOpenAd != null
}
fun loadAppOpenAd(onLoad: ((loaded: Boolean) -> Unit)? = null) {
......@@ -99,7 +103,7 @@ object AdmobOpenUtils {
if (!isRetry) {
val obj1 = JSONObject()
obj1.put("ad_unit", "openAd")
EventUtils.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show_open", ext = obj1)
LogEx.logDebug(TAG, "open ad_prepare_show")
}
......
......@@ -10,6 +10,7 @@ import androidx.lifecycle.lifecycleScope
import com.base.pdfviewerscannerwhite.BuildConfig
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.AdmobHelper.initAdmobAd
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.ads.admob.AdmobOpenUtils
import com.base.pdfviewerscannerwhite.bean.ConstObject.ifAgreePrivacy
import com.base.pdfviewerscannerwhite.bean.ConstObject.isFirstStart
......@@ -132,21 +133,41 @@ class SplashActivity : BaseActivity<ActivitySplash2Binding>(), SplashView {
override fun showAd() {
LogEx.logDebug(TAG, "showAd")
AdmobOpenUtils.loadAppOpenAd { loaded ->
LogEx.logDebug(TAG, "loadAppOpenAd loaded=$loaded")
if (loaded) {
AdmobOpenUtils.showAppOpenAd(this, showBefore = {
if (it) {
splashPresenter.pauseJumpJob()
}
}, onHidden = {
LogEx.logDebug(TAG, "ad jumpNext")
jumpNext()
})
if (AdmobOpenUtils.haveReadAd()) {
showReadOpenAd()
} else {
if (AdmobInterstitialUtils.haveReadAd()) {
showReadInterAd()
} else {
LogEx.logDebug(TAG, "no load ad jumpNext")
jumpNext()
AdmobOpenUtils.loadAppOpenAd { loaded ->
LogEx.logDebug(TAG, "loadAppOpenAd loaded=$loaded")
if (loaded) {
showReadOpenAd()
} else {
LogEx.logDebug(TAG, "no load ad jumpNext")
jumpNext()
}
}
}
}
}
private fun showReadOpenAd() {
AdmobOpenUtils.showAppOpenAd(this, showBefore = {
if (it) {
splashPresenter.pauseJumpJob()
}
}, onHidden = {
LogEx.logDebug(TAG, "ad jumpNext")
jumpNext()
})
}
private fun showReadInterAd() {
splashPresenter.pauseJumpJob()
AdmobInterstitialUtils.showInterstitialAd(this) {
jumpNext()
}
}
......
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