Commit b54caee8 authored by wanglei's avatar wanglei

...

parent df40beb7
package com.base.pdfviewerscannerwhite.ads package com.base.pdfviewerscannerwhite.ads
import android.app.Activity
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils
import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.EventUtils import com.base.pdfviewerscannerwhite.helper.EventUtils
import com.base.pdfviewerscannerwhite.helper.MyApplication import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.utils.AppPreferences import com.base.pdfviewerscannerwhite.utils.AppPreferences
...@@ -57,11 +60,12 @@ object AdmobHelper { ...@@ -57,11 +60,12 @@ object AdmobHelper {
var isAdInit = AtomicBoolean(false) var isAdInit = AtomicBoolean(false)
fun initAdmobAd() { fun initAdmobAd(activity: Activity) {
MobileAds.initialize(MyApplication.context) { initializationStatus -> MobileAds.initialize(MyApplication.context) { initializationStatus ->
isAdInit.set(true) isAdInit.set(true)
EventUtils.event("AdmobInit", "AdmobInit") EventUtils.event("AdmobInit", "AdmobInit")
AdmobNativeUtils.loadNativeAd() AdmobNativeUtils.loadNativeAd()
AdmobInterstitialUtils.loadInterstitialAd(activity)
} }
} }
......
...@@ -28,7 +28,6 @@ object AdmobInterstitialUtils { ...@@ -28,7 +28,6 @@ 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,10 +65,11 @@ object AdmobInterstitialUtils { ...@@ -66,10 +65,11 @@ object AdmobInterstitialUtils {
EventUtils.event("ad_prepare_show", ext = obj1) EventUtils.event("ad_prepare_show", ext = obj1)
if (interAd != null) { if (interAd != null) {
var dialog: Dialog? = null
if (!activity.isFinishing && !activity.isDestroyed) { if (!activity.isFinishing && !activity.isDestroyed) {
dialog = activity.showAdPreparingDialog() dialog = activity.showAdPreparingDialog()
} }
displayInterstitialAd(activity, onHidden) displayInterstitialAd(activity, dialog, onHidden)
} else { } else {
showAdDialogAndLoadInterstitial(activity, isReLoadAd, isShowDialog, onHidden) showAdDialogAndLoadInterstitial(activity, isReLoadAd, isShowDialog, onHidden)
} }
...@@ -148,7 +148,11 @@ object AdmobInterstitialUtils { ...@@ -148,7 +148,11 @@ object AdmobInterstitialUtils {
} }
} }
private fun displayInterstitialAd(activity: Activity, onHidden: ((showed: Boolean) -> Unit)? = null) { private fun displayInterstitialAd(
activity: Activity,
dialog: Dialog? = null,
onHidden: ((showed: Boolean) -> Unit)? = null
) {
val thisInterAd = interAd val thisInterAd = interAd
interAd = null interAd = null
thisInterAd?.fullScreenContentCallback = object : FullScreenContentCallback() { thisInterAd?.fullScreenContentCallback = object : FullScreenContentCallback() {
...@@ -158,6 +162,7 @@ object AdmobInterstitialUtils { ...@@ -158,6 +162,7 @@ object AdmobInterstitialUtils {
} }
override fun onAdDismissedFullScreenContent() { override fun onAdDismissedFullScreenContent() {
dialog?.dismiss()
interAd = null interAd = null
onHidden?.invoke(true) onHidden?.invoke(true)
loadInterstitialAd(activity) loadInterstitialAd(activity)
......
...@@ -76,6 +76,15 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -76,6 +76,15 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
} }
} }
override fun onPause() {
super.onPause()
searchTask?.stop()
}
override fun onDestroy() {
super.onDestroy()
}
override fun initView() { override fun initView() {
val metrics = DisplayMetrics() val metrics = DisplayMetrics()
...@@ -578,10 +587,6 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -578,10 +587,6 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
} }
override fun onPause() {
super.onPause()
searchTask?.stop()
}
fun switchOrientation() { fun switchOrientation() {
requestedOrientation = if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) { requestedOrientation = if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
......
...@@ -144,7 +144,7 @@ class SplashActivity : BaseActivity<ActivitySplash2Binding>(), SplashView { ...@@ -144,7 +144,7 @@ class SplashActivity : BaseActivity<ActivitySplash2Binding>(), SplashView {
override fun agreePrivacy() { override fun agreePrivacy() {
if (umpCanAd) { if (umpCanAd) {
initAdmobAd() initAdmobAd(this)
showAd() showAd()
splashPresenter.startJumpJob = true splashPresenter.startJumpJob = true
splashPresenter.startJumpJob(lifecycleScope) splashPresenter.startJumpJob(lifecycleScope)
......
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