Commit 6cca5ee4 authored by wanglei's avatar wanglei

。。。

parent 19693d9b
...@@ -6,9 +6,9 @@ import android.widget.Toast ...@@ -6,9 +6,9 @@ import android.widget.Toast
import com.base.browserwhite.BuildConfig import com.base.browserwhite.BuildConfig
import com.base.browserwhite.MyApplication import com.base.browserwhite.MyApplication
import com.base.browserwhite.R import com.base.browserwhite.R
import com.base.browserwhite.ads.AdDialog.showAdPreparingDialog
import com.base.browserwhite.ads.AdDisplayUtils import com.base.browserwhite.ads.AdDisplayUtils
import com.base.browserwhite.ads.AdmobMaxHelper.lastShowedOnHiddenTime import com.base.browserwhite.ads.AdmobMaxHelper.lastShowedOnHiddenTime
import com.base.browserwhite.ads.CustomDialog
import com.base.browserwhite.ads.admob.AdmobEvent.clickAd import com.base.browserwhite.ads.admob.AdmobEvent.clickAd
import com.base.browserwhite.ads.admob.AdmobEvent.pullAd import com.base.browserwhite.ads.admob.AdmobEvent.pullAd
import com.base.browserwhite.ads.admob.AdmobEvent.showAd import com.base.browserwhite.ads.admob.AdmobEvent.showAd
...@@ -29,7 +29,7 @@ object AdmobInterstitialUtils { ...@@ -29,7 +29,7 @@ object AdmobInterstitialUtils {
private var interLoadTime = Long.MAX_VALUE private var interLoadTime = Long.MAX_VALUE
private var adLastDisplayTime: Long = 0 private var adLastDisplayTime: Long = 0
private val mRequest = AdRequest.Builder().build() private val mRequest = AdRequest.Builder().build()
private var dialog: Dialog? = null
private fun isAdExpired(): Boolean { private fun isAdExpired(): Boolean {
return System.currentTimeMillis() - interLoadTime > 1000 * 60 * 60 return System.currentTimeMillis() - interLoadTime > 1000 * 60 * 60
...@@ -66,6 +66,9 @@ object AdmobInterstitialUtils { ...@@ -66,6 +66,9 @@ object AdmobInterstitialUtils {
} }
if (interAd != null) { if (interAd != null) {
if (!activity.isFinishing && !activity.isDestroyed) {
dialog = activity.showAdPreparingDialog()
}
displayInterstitialAd(activity, onHidden) displayInterstitialAd(activity, onHidden)
} else { } else {
showAdDialogAndLoadInterstitial(activity, isReLoadAd, isShowDialog, onHidden) showAdDialogAndLoadInterstitial(activity, isReLoadAd, isShowDialog, onHidden)
...@@ -126,7 +129,8 @@ object AdmobInterstitialUtils { ...@@ -126,7 +129,8 @@ object AdmobInterstitialUtils {
} }
var mDialog: Dialog? = null var mDialog: Dialog? = null
if (!activity.isFinishing && !activity.isDestroyed) { if (!activity.isFinishing && !activity.isDestroyed) {
mDialog = CustomDialog(activity, R.layout.dialog_ad_loading) // mDialog = CustomDialog(activity, R.layout.dialog_ad_loading)
mDialog = activity.showAdPreparingDialog()
// 设置对话框的样式和内容 // 设置对话框的样式和内容
mDialog.show() mDialog.show()
} }
...@@ -163,12 +167,14 @@ object AdmobInterstitialUtils { ...@@ -163,12 +167,14 @@ object AdmobInterstitialUtils {
} }
override fun onAdFailedToShowFullScreenContent(p0: AdError) { override fun onAdFailedToShowFullScreenContent(p0: AdError) {
dialog?.dismiss()
interAd = null interAd = null
onHidden?.invoke(false) onHidden?.invoke(false)
loadInterstitialAd(activity) loadInterstitialAd(activity)
} }
override fun onAdShowedFullScreenContent() { override fun onAdShowedFullScreenContent() {
dialog?.dismiss()
showAd(thisInterAd?.responseInfo, "interAd", activity) showAd(thisInterAd?.responseInfo, "interAd", activity)
AdDisplayUtils.getInstance().incrementAdDisplayCount() AdDisplayUtils.getInstance().incrementAdDisplayCount()
adLastDisplayTime = System.currentTimeMillis() / 1000 adLastDisplayTime = System.currentTimeMillis() / 1000
......
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