Commit 5e915ed4 authored by wanglei's avatar wanglei

...

parent 17c92327
...@@ -282,7 +282,7 @@ object AdmobUtils { ...@@ -282,7 +282,7 @@ object AdmobUtils {
fun showInterstitialAd( fun showInterstitialAd(
activity: Activity, activity: Activity,
isLoadAdNow: Boolean = false, isLoadAdNow: Boolean = false,
isShowInterVal :Boolean =true, isShowInterVal: Boolean = true,
onHidden: (() -> Unit)? = null onHidden: (() -> Unit)? = null
) { ) {
if (activity.isFinishing || activity.isDestroyed) { if (activity.isFinishing || activity.isDestroyed) {
...@@ -308,16 +308,22 @@ object AdmobUtils { ...@@ -308,16 +308,22 @@ object AdmobUtils {
} }
val interval = isTimeElapsed() val interval = isTimeElapsed()
if (interval <= 0||!isShowInterVal) { if (interval <= 0 || !isShowInterVal) {
showCachedInterstitialAd(activity, isLoadAdNow, onHidden) showCachedInterstitialAd(activity, isLoadAdNow, isShowInterVal, onHidden)
} else { } else {
showIntervalDialogAndShowAd(activity, isLoadAdNow, onHidden, interval) showIntervalDialogAndShowAd(activity, isLoadAdNow, isShowInterVal, onHidden, interval)
} }
} }
private var customDialog: CustomDialog? = null private var customDialog: CustomDialog? = null
private fun showIntervalDialogAndShowAd(activity: Activity, isLoadAdNow: Boolean, onHidden: (() -> Unit)?, interval: Int) { private fun showIntervalDialogAndShowAd(
activity: Activity,
isLoadAdNow: Boolean,
isShowInterVal: Boolean,
onHidden: (() -> Unit)?,
interval: Int
) {
if (customDialog != null && customDialog?.isShowing == true) { if (customDialog != null && customDialog?.isShowing == true) {
return // 如果对话框已经显示,则不再显示 return // 如果对话框已经显示,则不再显示
} }
...@@ -331,7 +337,7 @@ object AdmobUtils { ...@@ -331,7 +337,7 @@ object AdmobUtils {
} }
override fun onFinish() { override fun onFinish() {
showCachedInterstitialAd(activity, isLoadAdNow, onHidden) showCachedInterstitialAd(activity, isLoadAdNow, isShowInterVal, onHidden)
customDialog?.dismiss() customDialog?.dismiss()
customDialog = null customDialog = null
} }
...@@ -344,12 +350,13 @@ object AdmobUtils { ...@@ -344,12 +350,13 @@ object AdmobUtils {
private fun showCachedInterstitialAd( private fun showCachedInterstitialAd(
activity: Activity, activity: Activity,
isLoadAdNow: Boolean, isLoadAdNow: Boolean,
isShowInterVal: Boolean = true,
onHidden: (() -> Unit)? onHidden: (() -> Unit)?
) { ) {
if (interAd != null) { if (interAd != null) {
displayInterstitialAd(activity, onHidden) displayInterstitialAd(activity, onHidden)
} else { } else {
showAdDialogAndLoadInterstitial(activity, isLoadAdNow, onHidden) showAdDialogAndLoadInterstitial(activity, isLoadAdNow, isShowInterVal, onHidden)
} }
} }
...@@ -363,6 +370,7 @@ object AdmobUtils { ...@@ -363,6 +370,7 @@ object AdmobUtils {
private fun showAdDialogAndLoadInterstitial( private fun showAdDialogAndLoadInterstitial(
activity: Activity, activity: Activity,
isLoadAdNow: Boolean, isLoadAdNow: Boolean,
isShowInterVal: Boolean,
onHidden: (() -> Unit)? onHidden: (() -> Unit)?
) { ) {
var mDialog: Dialog? = null var mDialog: Dialog? = null
...@@ -376,7 +384,7 @@ object AdmobUtils { ...@@ -376,7 +384,7 @@ object AdmobUtils {
loadInterstitialAd(activity) { loadInterstitialAd(activity) {
mDialog?.dismiss() mDialog?.dismiss()
if (!isLoadAdNow) { if (!isLoadAdNow) {
showInterstitialAd(activity, true) { showInterstitialAd(activity, true, isShowInterVal) {
onHidden?.invoke() onHidden?.invoke()
} }
} }
......
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