Commit 79c9e404 authored by wanglei's avatar wanglei

...

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