Commit f27e9db1 authored by wanglei's avatar wanglei

...

parent 530276ee
Pipeline #1417 canceled with stages
...@@ -239,10 +239,10 @@ object AdmobHelper { ...@@ -239,10 +239,10 @@ object AdmobHelper {
loaded: (() -> Unit?)? = null, loaded: (() -> Unit?)? = null,
failed: (() -> Unit?)? = null, failed: (() -> Unit?)? = null,
) { ) {
// if (!checkAvailable(INTERSTITIAL_AD_UNIT, true)) { if (!checkAvailable(INTERSTITIAL_AD_UNIT, true)) {
// failed?.invoke() failed?.invoke()
// return return
// } }
// if (isLoadingInterstitialAd) { // if (isLoadingInterstitialAd) {
// failed?.invoke() // failed?.invoke()
// return // return
...@@ -777,9 +777,12 @@ object AdmobHelper { ...@@ -777,9 +777,12 @@ object AdmobHelper {
private fun checkAvailable(adUnit: String, notCheckIntervalTime: Boolean = false): Boolean { private fun checkAvailable(adUnit: String, notCheckIntervalTime: Boolean = false): Boolean {
if (isBlacklist()) { if (isBlacklist()) {
Log.d("glc","isBlacklist")
ReportAdUtils.showErrorAd(EVENT_BLACKLIST, adUnit) ReportAdUtils.showErrorAd(EVENT_BLACKLIST, adUnit)
return false return false
} }
Log.d("glc","isBlacklist() = false ")
val currentTime = System.currentTimeMillis() val currentTime = System.currentTimeMillis()
var lastDisplayTime = SpUtils.getInstance().getLong(KEY_LAST_DISPLAY_TIME) var lastDisplayTime = SpUtils.getInstance().getLong(KEY_LAST_DISPLAY_TIME)
if (lastDisplayTime.toInt() != 0 && !areTimestampsSameDay(currentTime, lastDisplayTime)) { if (lastDisplayTime.toInt() != 0 && !areTimestampsSameDay(currentTime, lastDisplayTime)) {
...@@ -797,14 +800,17 @@ object AdmobHelper { ...@@ -797,14 +800,17 @@ object AdmobHelper {
val adClick = SpUtils.getInstance().getInt(KEY_AD_CLICK, DEFAULT_AD_CLICK) val adClick = SpUtils.getInstance().getInt(KEY_AD_CLICK, DEFAULT_AD_CLICK)
if (displayNumber >= adShow) { if (displayNumber >= adShow) {
ReportAdUtils.showErrorAd(EVENT_SHOW_DISPLAYS, adUnit) ReportAdUtils.showErrorAd(EVENT_SHOW_DISPLAYS, adUnit)
Log.d("glc","displayNumber >= adShow: "+displayNumber+" adShow:"+adShow)
return false return false
} }
if (requestNumber >= adRequest) { if (requestNumber >= adRequest) {
ReportAdUtils.showErrorAd(EVENT_SHOW_REQUESTS, adUnit) ReportAdUtils.showErrorAd(EVENT_SHOW_REQUESTS, adUnit)
Log.d("glc","requestNumber >= adRequest: "+requestNumber)
return false return false
} }
if (clickNumber >= adClick) { if (clickNumber >= adClick) {
ReportAdUtils.showErrorAd(EVENT_SHOW_CLICKS, adUnit) ReportAdUtils.showErrorAd(EVENT_SHOW_CLICKS, adUnit)
Log.d("glc","clickNumber >= adClick: "+requestNumber)
return false return false
} }
if (notCheckIntervalTime || lastDisplayTime.toInt() == 0) return true if (notCheckIntervalTime || lastDisplayTime.toInt() == 0) return true
......
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