Commit 5cad16aa authored by wanglei's avatar wanglei

...

parent 608a7872
...@@ -108,7 +108,7 @@ public class AdDisplayUtils { ...@@ -108,7 +108,7 @@ public class AdDisplayUtils {
LogEx.INSTANCE.logDebug("glc", "!shouldShowAd", false); LogEx.INSTANCE.logDebug("glc", "!shouldShowAd", false);
JSONObject obj2 = new JSONObject(); JSONObject obj2 = new JSONObject();
try { try {
obj2.put("reason", "ad limit"); obj2.put("reason", "ad_limit");
obj2.put("shouldSendAdRequest", shouldSendAdRequest); obj2.put("shouldSendAdRequest", shouldSendAdRequest);
obj2.put("shouldIncrementRequestFailAd", shouldIncrementRequestFailAd); obj2.put("shouldIncrementRequestFailAd", shouldIncrementRequestFailAd);
obj2.put("shouldDisplayAd", shouldDisplayAd); obj2.put("shouldDisplayAd", shouldDisplayAd);
...@@ -127,7 +127,7 @@ public class AdDisplayUtils { ...@@ -127,7 +127,7 @@ public class AdDisplayUtils {
obj2.put("adRequestCount", adRequestCount); obj2.put("adRequestCount", adRequestCount);
obj2.put("ad_unit", ad_unit); obj2.put("ad_unit", ad_unit);
EventUtils.INSTANCE.event("ad_show_error", null, obj2, false); EventUtils.INSTANCE.event("ad_limit", null, obj2, false);
} catch (JSONException ignored) { } catch (JSONException ignored) {
} }
......
...@@ -66,6 +66,11 @@ object AdmobMaxHelper { ...@@ -66,6 +66,11 @@ object AdmobMaxHelper {
return isDeleteInterAd == 1 return isDeleteInterAd == 1
} }
fun openShowInterSp(): Boolean {
val openShowInterSp = AppPreferences.getInstance().getString("isOpenShowInterSp", "0").toInt()
return openShowInterSp == 1
}
fun initAdmobMaxAd() { fun initAdmobMaxAd() {
if (isBlack) { if (isBlack) {
...@@ -122,20 +127,18 @@ object AdmobMaxHelper { ...@@ -122,20 +127,18 @@ object AdmobMaxHelper {
fun admobMaxShowOpenAd( fun admobMaxShowOpenAd(
activity: Activity, showBeforeAction: (flag: Boolean) -> Unit, activity: Activity, showBeforeAction: (flag: Boolean) -> Unit,
onHidden: (() -> Unit)? = null, onHidden: ((showed: Boolean) -> Unit)? = null,
) { ) {
if (isBlack) { if (isBlack) {
EventUtils.event("ad_black", "openAd") EventUtils.event("ad_black", "openAd")
onHidden?.invoke() onHidden?.invoke(false)
return return
} }
if (getSpAdmobTrueMaxFalse()) { if (getSpAdmobTrueMaxFalse()) {
AdmobOpenUtils.showAppOpenAd(activity, showBefore = showBeforeAction) { AdmobOpenUtils.showAppOpenAd(activity, showBefore = showBeforeAction, onHidden = onHidden)
onHidden?.invoke()
}
} else { } else {
AdMaxOpenUtils.showAppOpenAd(activity, loadCallBack = showBeforeAction) { AdMaxOpenUtils.showAppOpenAd(activity, loadCallBack = showBeforeAction) {
onHidden?.invoke() onHidden?.invoke(true)
} }
} }
} }
......
...@@ -46,9 +46,6 @@ object AdmobInterstitialUtils { ...@@ -46,9 +46,6 @@ object AdmobInterstitialUtils {
if (activity.isFinishing || activity.isDestroyed) { if (activity.isFinishing || activity.isDestroyed) {
return return
} }
val obj1 = JSONObject()
obj1.put("ad_unit", "interAd")
EventUtils.event("ad_prepare_show", ext = obj1)
if (isAdExpired()) { if (isAdExpired()) {
val obj2 = JSONObject() val obj2 = JSONObject()
...@@ -65,6 +62,10 @@ object AdmobInterstitialUtils { ...@@ -65,6 +62,10 @@ object AdmobInterstitialUtils {
return return
} }
val obj1 = JSONObject()
obj1.put("ad_unit", "interAd")
EventUtils.event("ad_prepare_show", ext = obj1)
if (interAd != null) { if (interAd != null) {
if (!activity.isFinishing && !activity.isDestroyed) { if (!activity.isFinishing && !activity.isDestroyed) {
dialog = activity.showAdPreparingDialog() dialog = activity.showAdPreparingDialog()
......
...@@ -69,21 +69,21 @@ object AdmobOpenUtils { ...@@ -69,21 +69,21 @@ object AdmobOpenUtils {
activity: Activity, activity: Activity,
isRetry: Boolean = false, isRetry: Boolean = false,
showBefore: ((flag: Boolean) -> Unit)? = null, showBefore: ((flag: Boolean) -> Unit)? = null,
onHidden: ((where: Int) -> Unit)? = null onHidden: ((showed: Boolean) -> Unit)? = null
) { ) {
if (activity.isFinishing || activity.isDestroyed) { if (activity.isFinishing || activity.isDestroyed) {
return return
} }
if (!AdDisplayUtils.getInstance().shouldShowAd("openAd")) { if (!AdDisplayUtils.getInstance().shouldShowAd("openAd")) {
onHidden?.invoke(1) onHidden?.invoke(false)
return return
} }
if (System.currentTimeMillis() - openLoadTime > 1000 * 60 * 60) { if (System.currentTimeMillis() - openLoadTime > 1000 * 60 * 60) {
LogEx.logDebug(TAG, "openLoadTime out time") LogEx.logDebug(TAG, "openLoadTime out time")
mOpenAd = null mOpenAd = null
loadAppOpenAd() loadAppOpenAd()
onHidden?.invoke(2) onHidden?.invoke(false)
val obj2 = JSONObject() val obj2 = JSONObject()
obj2.put("ad_unit", "openAd") obj2.put("ad_unit", "openAd")
EventUtils.event("ad_expire", ext = obj2) EventUtils.event("ad_expire", ext = obj2)
...@@ -93,6 +93,7 @@ object AdmobOpenUtils { ...@@ -93,6 +93,7 @@ object AdmobOpenUtils {
val obj1 = JSONObject() val obj1 = JSONObject()
obj1.put("ad_unit", "openAd") obj1.put("ad_unit", "openAd")
EventUtils.event("ad_prepare_show", ext = obj1) EventUtils.event("ad_prepare_show", ext = obj1)
LogEx.logDebug(TAG, "open ad_prepare_show")
} }
if (mOpenAd != null) { if (mOpenAd != null) {
...@@ -106,13 +107,13 @@ object AdmobOpenUtils { ...@@ -106,13 +107,13 @@ object AdmobOpenUtils {
override fun onAdDismissedFullScreenContent() { override fun onAdDismissedFullScreenContent() {
mOpenAd = null mOpenAd = null
onHidden?.invoke(3) onHidden?.invoke(true)
loadAppOpenAd() loadAppOpenAd()
} }
override fun onAdFailedToShowFullScreenContent(p0: AdError) { override fun onAdFailedToShowFullScreenContent(p0: AdError) {
mOpenAd = null mOpenAd = null
onHidden?.invoke(4) onHidden?.invoke(false)
loadAppOpenAd() loadAppOpenAd()
val obj = JSONObject() val obj = JSONObject()
obj.put("reason", p0.message) obj.put("reason", p0.message)
...@@ -136,7 +137,7 @@ object AdmobOpenUtils { ...@@ -136,7 +137,7 @@ object AdmobOpenUtils {
obj.put("reason", "no_ad") obj.put("reason", "no_ad")
obj.put("ad_unit", "openAd") obj.put("ad_unit", "openAd")
EventUtils.event("ad_show_error", ext = obj) EventUtils.event("ad_show_error", ext = obj)
onHidden?.invoke(5) onHidden?.invoke(false)
} }
} }
} }
......
...@@ -23,8 +23,8 @@ import com.base.browserwhite.help.EventUtils ...@@ -23,8 +23,8 @@ import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.help.WeatherUtils import com.base.browserwhite.help.WeatherUtils
import com.base.browserwhite.service.StayNotificationService.Companion.startStayNotification import com.base.browserwhite.service.StayNotificationService.Companion.startStayNotification
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.widget.BrowserAppWidget
import com.base.browserwhite.utils.AnimationUtils import com.base.browserwhite.utils.AnimationUtils
import com.base.browserwhite.utils.AppPreferences
import com.base.browserwhite.utils.BarUtils import com.base.browserwhite.utils.BarUtils
import com.base.browserwhite.utils.LogEx import com.base.browserwhite.utils.LogEx
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
...@@ -213,14 +213,31 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(), ...@@ -213,14 +213,31 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
} }
private fun loadAd() { private fun loadAd() {
LogEx.logDebug(TAG, "loadAd")
AdmobMaxHelper.admobMaxShowOpenAd(this, { AdmobMaxHelper.admobMaxShowOpenAd(this, {
mTaskManager?.pauseProgress() mTaskManager?.pauseProgress()
}, { }, { showed ->
mTaskManager?.pauseProgress() LogEx.logDebug(TAG, "open ad showed=$showed")
runOnUiThread { if (showed) {
mTaskManager?.maxProgress() mTaskManager?.pauseProgress()
runOnUiThread {
mTaskManager?.maxProgress()
}
} else {
if (AdmobMaxHelper.openShowInterSp()) {
AdmobMaxHelper.showIntervalAd(this) {
mTaskManager?.pauseProgress()
runOnUiThread {
mTaskManager?.maxProgress()
}
}
} else {
mTaskManager?.pauseProgress()
runOnUiThread {
mTaskManager?.maxProgress()
}
}
} }
}) })
} }
......
package com.base.browserwhite.ui.activity.splash package com.base.browserwhite.ui.activity.splash
import android.os.Handler import android.os.Handler
import android.view.View
import androidx.core.view.isVisible
import com.base.browserwhite.databinding.ActivitySplash2Binding import com.base.browserwhite.databinding.ActivitySplash2Binding
class TaskManager { class TaskManager {
......
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