Commit 46a5c050 authored by wanglei's avatar wanglei

...

parent bc339ea6
...@@ -128,15 +128,23 @@ class MyApplication : BaseApplication() { ...@@ -128,15 +128,23 @@ class MyApplication : BaseApplication() {
if (flag && !isInterOpenShowing) { if (flag && !isInterOpenShowing) {
if (AdmobMaxHelper.isOpenAdLoaded()) { if (AdmobMaxHelper.isOpenAdLoaded()) {
var loaded: Boolean = true // var loaded: Boolean = true
AdmobMaxHelper.admobMaxShowOpenAd(activity, { // AdmobMaxHelper.admobMaxShowOpenAd(activity, {
loaded = it // loaded = it
}, { // }, {
val sp = AppPreferences.getInstance().getString("splashShowInter", "0").toInt() // val sp = AppPreferences.getInstance().getString("splashShowInter", "0").toInt()
if (sp == 1 && !loaded) { // if (sp == 1 && !loaded) {
AdmobMaxHelper.admobMaxShowInterstitialAd(activity) // AdmobMaxHelper.admobMaxShowInterstitialAd(activity)
} // }
}) // })
topActivity?.startActivity(
Intent(
topActivity,
SplashActivity::class.java
).apply {
putExtra("isHotLaunch", true)
putExtra("type", -1)
})
} else { } else {
topActivity?.startActivity( topActivity?.startActivity(
Intent( Intent(
......
...@@ -62,12 +62,23 @@ object AdmobMaxHelper { ...@@ -62,12 +62,23 @@ object AdmobMaxHelper {
} }
} }
//展示广告关闭时赋值
var lastShowedOnHiddenTime = System.currentTimeMillis()
fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) { fun admobMaxShowInterstitialAd(activity: Activity, onHidden: (() -> Unit)? = null) {
if (isBlack) { if (isBlack) {
onHidden?.invoke() onHidden?.invoke()
return return
} }
val isShowLoadingAd = AppPreferences.getInstance().getString("isShowLoadingAd", "0").toInt()
if (isShowLoadingAd == 0) {
onHidden?.invoke()
return
}
val adInterval = AppPreferences.getInstance().getString("adInterval", "0").toInt()
if ((System.currentTimeMillis() - lastShowedOnHiddenTime) < adInterval * 1000) {
onHidden?.invoke()
return
}
if (getSpAdmobTrueMaxFalse()) { if (getSpAdmobTrueMaxFalse()) {
AdmobInterstitialUtils.showInterstitialAd(activity) { AdmobInterstitialUtils.showInterstitialAd(activity) {
......
...@@ -7,6 +7,7 @@ import android.view.ViewGroup ...@@ -7,6 +7,7 @@ import android.view.ViewGroup
import android.view.ViewTreeObserver import android.view.ViewTreeObserver
import com.base.filerecoveryrecyclebin.BuildConfig import com.base.filerecoveryrecyclebin.BuildConfig
import com.base.filerecoveryrecyclebin.help.ConfigHelper import com.base.filerecoveryrecyclebin.help.ConfigHelper
import com.base.filerecoveryrecyclebin.utils.AppPreferences
import com.google.ads.mediation.admob.AdMobAdapter import com.google.ads.mediation.admob.AdMobAdapter
import com.google.android.gms.ads.AdListener import com.google.android.gms.ads.AdListener
import com.google.android.gms.ads.AdRequest import com.google.android.gms.ads.AdRequest
...@@ -20,6 +21,10 @@ object AdmobBannerUtils { ...@@ -20,6 +21,10 @@ object AdmobBannerUtils {
private var listener: ViewTreeObserver.OnGlobalLayoutListener? = null private var listener: ViewTreeObserver.OnGlobalLayoutListener? = null
fun showCollapsibleBannerAd(context: Context, parent: ViewGroup) { fun showCollapsibleBannerAd(context: Context, parent: ViewGroup) {
val isShowBanner = AppPreferences.getInstance().getString("isShowBanner", "0").toInt()
if (isShowBanner == 0) {
return
}
if (adView != null) { if (adView != null) {
adView?.destroy() adView?.destroy()
} }
......
...@@ -8,6 +8,7 @@ import android.widget.Toast ...@@ -8,6 +8,7 @@ import android.widget.Toast
import com.base.filerecoveryrecyclebin.BuildConfig import com.base.filerecoveryrecyclebin.BuildConfig
import com.base.filerecoveryrecyclebin.R import com.base.filerecoveryrecyclebin.R
import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils
import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper.lastShowedOnHiddenTime
import com.base.filerecoveryrecyclebin.ads.admob.AdmobCommonUtils.isMultiClick import com.base.filerecoveryrecyclebin.ads.admob.AdmobCommonUtils.isMultiClick
import com.base.filerecoveryrecyclebin.ads.admob.AdmobEvent.clickAd import com.base.filerecoveryrecyclebin.ads.admob.AdmobEvent.clickAd
import com.base.filerecoveryrecyclebin.ads.admob.AdmobEvent.pullAd import com.base.filerecoveryrecyclebin.ads.admob.AdmobEvent.pullAd
...@@ -206,6 +207,7 @@ object AdmobInterstitialUtils { ...@@ -206,6 +207,7 @@ object AdmobInterstitialUtils {
interAd = null interAd = null
onHidden?.invoke() onHidden?.invoke()
loadInterstitialAd(activity) loadInterstitialAd(activity)
lastShowedOnHiddenTime = System.currentTimeMillis()
} }
override fun onAdFailedToShowFullScreenContent(p0: AdError) { override fun onAdFailedToShowFullScreenContent(p0: AdError) {
......
...@@ -11,6 +11,7 @@ import com.base.filerecoveryrecyclebin.MyApplication.Companion.isInterOpenShowin ...@@ -11,6 +11,7 @@ import com.base.filerecoveryrecyclebin.MyApplication.Companion.isInterOpenShowin
import com.base.filerecoveryrecyclebin.R import com.base.filerecoveryrecyclebin.R
import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils
import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper.isAdInit import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper.isAdInit
import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper.lastShowedOnHiddenTime
import com.base.filerecoveryrecyclebin.help.ConfigHelper import com.base.filerecoveryrecyclebin.help.ConfigHelper
import com.base.filerecoveryrecyclebin.utils.EventUtils import com.base.filerecoveryrecyclebin.utils.EventUtils
import com.base.filerecoveryrecyclebin.utils.LogEx import com.base.filerecoveryrecyclebin.utils.LogEx
...@@ -70,6 +71,7 @@ object AdMaxInterstitialUtils { ...@@ -70,6 +71,7 @@ object AdMaxInterstitialUtils {
// loadInterstitialAd(activity) // loadInterstitialAd(activity)
isInterOpenShowing = false isInterOpenShowing = false
lastShowedOnHiddenTime = System.currentTimeMillis()
} }
override fun onAdClicked(p0: MaxAd) { override fun onAdClicked(p0: MaxAd) {
......
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