Skip to content

B
Browser White
Commit 2daabdee authored by wanglei's avatar wanglei
Browse files
Options

...

parent 3527c425
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 72 deletions
app/src/main/java/com/base/browserwhite/ads/AdDisplayUtils.java
View file @ 2daabdee
......@@ -7,7 +7,7 @@ import android.util.Log;
import com.base.browserwhite.BuildConfig;
import com.base.browserwhite.MyApplication;
import com.base.browserwhite.help.EventHelper;
import com.base.browserwhite.help.EventUtils;
import com.base.browserwhite.utils.AppPreferences;
import com.base.browserwhite.utils.LogEx;
import com.facebook.appevents.AppEventsLogger;
......@@ -127,7 +127,7 @@ public class AdDisplayUtils {
obj2.put("adRequestCount", adRequestCount);
obj2.put("ad_unit", ad_unit);
EventHelper.INSTANCE.event("ad_show_error", null, obj2, false);
EventUtils.INSTANCE.event("ad_show_error", null, obj2, false);
} catch (JSONException ignored) {
}
......
app/src/main/java/com/base/browserwhite/ads/AdmobMaxHelper.kt
View file @ 2daabdee
......@@ -13,7 +13,7 @@ import com.base.browserwhite.ads.max.AdMaxInit.initAdMax
import com.base.browserwhite.ads.max.AdMaxInterstitialUtils
import com.base.browserwhite.ads.max.AdMaxNativeUtils
import com.base.browserwhite.ads.max.AdMaxOpenUtils
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.AppPreferences
import com.base.browserwhite.utils.LogEx
import com.google.android.gms.ads.MobileAds
......@@ -64,7 +64,7 @@ object AdmobMaxHelper {
LogEx.logDebug(TAG, "init sp Admob")
MobileAds.initialize(MyApplication.context) { initializationStatus ->
isAdInit.set(true)
EventHelper.event("AdmobInit", "AdmobInit")
EventUtils.event("AdmobInit", "AdmobInit")
}
}
} else {
......@@ -80,20 +80,20 @@ object AdmobMaxHelper {
var lastShowedOnHiddenTime = 0L
fun admobMaxShowInterstitialAd(activity: Activity, isLoading: Boolean = true, onHidden: ((showed: Boolean) -> Unit)? = null) {
if (isBlack) {
EventHelper.event("ad_black", "interAd")
EventUtils.event("ad_black", "interAd")
onHidden?.invoke(false)
return
}
val isShowLoadingAd = AppPreferences.getInstance().getString("isShowLoadingAd", "0").toInt()
if (isShowLoadingAd == 0 && isLoading) {
EventHelper.event("ad_switch_close")
EventUtils.event("ad_switch_close")
onHidden?.invoke(false)
return
}
val adInterval = AppPreferences.getInstance().getString("adInterval", "0").toInt()
if ((System.currentTimeMillis() - lastShowedOnHiddenTime) < adInterval * 1000 && lastShowedOnHiddenTime != 0L) {
onHidden?.invoke(false)
EventHelper.event("ad_interval")
EventUtils.event("ad_interval")
return
}
......@@ -113,7 +113,7 @@ object AdmobMaxHelper {
onHidden: (() -> Unit)? = null,
) {
if (isBlack) {
EventHelper.event("ad_black", "openAd")
EventUtils.event("ad_black", "openAd")
onHidden?.invoke()
return
}
......
app/src/main/java/com/base/browserwhite/ads/admob/AdmobEvent.kt
View file @ 2daabdee
......@@ -3,7 +3,7 @@ package com.base.browserwhite.ads.admob
import android.app.Activity
import android.os.Bundle
import com.base.browserwhite.MyApplication
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.facebook.appevents.AppEventsConstants
import com.facebook.appevents.AppEventsLogger
import com.google.android.gms.ads.AdValue
......@@ -49,7 +49,7 @@ object AdmobEvent {
obj.put("errMsg", error)
obj.put("status", "2")
}
EventHelper.event("ad_pull", ext = obj)
EventUtils.event("ad_pull", ext = obj)
}
private val taichiPref by lazy {
......@@ -199,7 +199,7 @@ object AdmobEvent {
obj.put("session_id", sessionId)
}
}
EventHelper.event("ad_price", ext = obj)
EventUtils.event("ad_price", ext = obj)
}
}
......@@ -219,9 +219,9 @@ object AdmobEvent {
obj.put("session_id", responseInfo?.responseId)
obj.put("networkname", responseInfo?.mediationAdapterClassName)
if (adUnit != "nativeAd") {
EventHelper.event("ad_click", ext = obj)
EventUtils.event("ad_click", ext = obj)
} else {
EventHelper.event("bigimage_ad_click", ext = obj)
EventUtils.event("bigimage_ad_click", ext = obj)
}
}
......@@ -240,9 +240,9 @@ object AdmobEvent {
obj.put("session_id", responseInfo?.responseId)
obj.put("from", activity?.javaClass?.simpleName)
if (adUnit != "nativeAd") {
EventHelper.event("ad_show", ext = obj)
EventUtils.event("ad_show", ext = obj)
} else {
EventHelper.event("bigimage_ad_show", ext = obj)
EventUtils.event("bigimage_ad_show", ext = obj)
}
}
}
\ No newline at end of file
app/src/main/java/com/base/browserwhite/ads/admob/AdmobInterstitialUtils.kt
View file @ 2daabdee
......@@ -13,7 +13,7 @@ import com.base.browserwhite.ads.admob.AdmobEvent.clickAd
import com.base.browserwhite.ads.admob.AdmobEvent.pullAd
import com.base.browserwhite.ads.admob.AdmobEvent.showAd
import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.google.android.gms.ads.AdError
import com.google.android.gms.ads.AdRequest
import com.google.android.gms.ads.FullScreenContentCallback
......@@ -48,12 +48,12 @@ object AdmobInterstitialUtils {
}
val obj1 = JSONObject()
obj1.put("ad_unit", "interAd")
EventHelper.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show", ext = obj1)
if (isAdExpired()) {
val obj2 = JSONObject()
obj2.put("ad_unit", "interAd")
EventHelper.event("ad_expire", ext = obj2)
EventUtils.event("ad_expire", ext = obj2)
interAd = null
loadInterstitialAd(activity)
onHidden?.invoke(false)
......@@ -86,7 +86,7 @@ object AdmobInterstitialUtils {
obj.put("req_id", reqId)
obj.put("ad_type", "interAd")
obj.put("from", activity.javaClass.simpleName)
EventHelper.event("ad_pull_start", ext = obj)
EventUtils.event("ad_pull_start", ext = obj)
InterstitialAd.load(
activity,
if (BuildConfig.DEBUG) ConfigHelper.interAdmobIdTest else ConfigHelper.interAdmobId,
......
app/src/main/java/com/base/browserwhite/ads/admob/AdmobNativeUtils.kt
View file @ 2daabdee
......@@ -11,7 +11,7 @@ import com.base.browserwhite.ads.admob.AdmobEvent.clickAd
import com.base.browserwhite.ads.admob.AdmobEvent.pullAd
import com.base.browserwhite.ads.admob.AdmobEvent.showAd
import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import com.google.android.gms.ads.AdListener
import com.google.android.gms.ads.AdLoader
......@@ -87,7 +87,7 @@ object AdmobNativeUtils {
fun showNativeAd(activity: Activity?, parent: ViewGroup, layout: Int = R.layout.layout_admob_native_custom) {
val obj = JSONObject()
obj.put("ad_unit", "NativeAd")
EventHelper.event("ad_prepare_show_native", ext = obj)
EventUtils.event("ad_prepare_show_native", ext = obj)
if (!AdDisplayUtils.getInstance().shouldShowAd("NativeAd")) {
return
}
......@@ -112,7 +112,7 @@ object AdmobNativeUtils {
val obj2 = JSONObject()
obj2.put("reason", "no_ad")
obj2.put("ad_unit", "nativeAd")
EventHelper.event("ad_show_error", ext = obj2)
EventUtils.event("ad_show_error", ext = obj2)
} else {
loadingListener?.invoke()
}
......
app/src/main/java/com/base/browserwhite/ads/admob/AdmobOpenUtils.kt
View file @ 2daabdee
......@@ -8,7 +8,7 @@ import com.base.browserwhite.ads.admob.AdmobEvent.clickAd
import com.base.browserwhite.ads.admob.AdmobEvent.pullAd
import com.base.browserwhite.ads.admob.AdmobEvent.showAd
import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import com.google.android.gms.ads.AdError
import com.google.android.gms.ads.AdRequest
......@@ -40,7 +40,7 @@ object AdmobOpenUtils {
val obj = JSONObject()
obj.put("req_id", reqId)
obj.put("ad_type", "openAd")
EventHelper.event("ad_pull_start", ext = obj)
EventUtils.event("ad_pull_start", ext = obj)
AppOpenAd.load(
MyApplication.context,
if (BuildConfig.DEBUG) ConfigHelper.openAdmobIdTest else ConfigHelper.openAdmobId,
......@@ -86,13 +86,13 @@ object AdmobOpenUtils {
onHidden?.invoke(2)
val obj2 = JSONObject()
obj2.put("ad_unit", "openAd")
EventHelper.event("ad_expire", ext = obj2)
EventUtils.event("ad_expire", ext = obj2)
return
}
if (!isRetry) {
val obj1 = JSONObject()
obj1.put("ad_unit", "openAd")
EventHelper.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show", ext = obj1)
}
if (mOpenAd != null) {
......@@ -117,7 +117,7 @@ object AdmobOpenUtils {
val obj = JSONObject()
obj.put("reason", p0.message)
obj.put("ad_unit", "openAd")
EventHelper.event("ad_show_error", ext = obj)
EventUtils.event("ad_show_error", ext = obj)
}
override fun onAdShowedFullScreenContent() {
......@@ -135,7 +135,7 @@ object AdmobOpenUtils {
val obj = JSONObject()
obj.put("reason", "no_ad")
obj.put("ad_unit", "openAd")
EventHelper.event("ad_show_error", ext = obj)
EventUtils.event("ad_show_error", ext = obj)
onHidden?.invoke(5)
}
}
......
app/src/main/java/com/base/browserwhite/ads/max/AdMaxEvent.kt
View file @ 2daabdee
......@@ -5,7 +5,7 @@ import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdRevenueListener
import com.applovin.sdk.AppLovinSdk
import com.base.browserwhite.MyApplication
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import com.facebook.FacebookSdk
import com.facebook.appevents.AppEventsConstants
......@@ -35,7 +35,7 @@ object AdMaxEvent {
obj.put("errMsg", error)
obj.put("status", "2")
}
EventHelper.event("ad_pull", ext = obj)
EventUtils.event("ad_pull", ext = obj)
}
fun clickAd(ad: MaxAd?, adUnit: String) {
......@@ -53,9 +53,9 @@ object AdMaxEvent {
obj.put("latency", ad?.requestLatencyMillis)
obj.put("valueMicros", ad?.revenue)
if (!adUnit.equals("nativeAd")) {
EventHelper.event("ad_click", ext = obj)
EventUtils.event("ad_click", ext = obj)
} else {
EventHelper.event("big_imgad_click", ext = obj)
EventUtils.event("big_imgad_click", ext = obj)
}
}
......@@ -77,9 +77,9 @@ object AdMaxEvent {
obj.put("mediation", "applovin")
LogEx.logDebug("glc", "from: $activity")
if (adUnit != "nativeAd") {
EventHelper.event("ad_show", ext = obj)
EventUtils.event("ad_show", ext = obj)
} else {
EventHelper.event("big_img_show", ext = obj)
EventUtils.event("big_img_show", ext = obj)
}
}
......@@ -137,7 +137,7 @@ object AdMaxEvent {
obj.put("adFormat", adFormat)
obj.put("placement", placement)
obj.put("networkPlacement", networkPlacement)
EventHelper.event("ad_price", ext = obj)
EventUtils.event("ad_price", ext = obj)
}
}
......
app/src/main/java/com/base/browserwhite/ads/max/AdMaxInit.kt
View file @ 2daabdee
......@@ -5,7 +5,7 @@ import com.applovin.sdk.AppLovinMediationProvider
import com.applovin.sdk.AppLovinSdk
import com.applovin.sdk.AppLovinSdkInitializationConfiguration
import com.base.browserwhite.ads.AdmobMaxHelper.isAdInit
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import java.util.concurrent.Executors
......@@ -39,7 +39,7 @@ object AdMaxInit {
isAdInit.set(true)
maxInitAction?.invoke()
maxInitAction = null
EventHelper.event("MaxInit", "MaxInit")
EventUtils.event("MaxInit", "MaxInit")
}
executor.shutdown()
......
app/src/main/java/com/base/browserwhite/ads/max/AdMaxInterstitialUtils.kt
View file @ 2daabdee
......@@ -12,7 +12,7 @@ import com.base.browserwhite.ads.AdmobMaxHelper.isInterOpenShowing
import com.base.browserwhite.ads.AdmobMaxHelper.lastShowedOnHiddenTime
import com.base.browserwhite.ads.CustomDialog
import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import org.json.JSONObject
import java.util.UUID
......@@ -87,7 +87,7 @@ object AdMaxInterstitialUtils {
obj2.put("code", p1.code)
obj2.put("reason", p1.message)
obj2.put("ad_unit", "interAd")
EventHelper.event("ad_show_error", ext = obj2)
EventUtils.event("ad_show_error", ext = obj2)
isInterOpenShowing = false
}
......@@ -106,7 +106,7 @@ object AdMaxInterstitialUtils {
if (isAdExpired()) {
val obj2 = JSONObject()
obj2.put("ad_unit", "interAd")
EventHelper.event("ad_expire", ext = obj2)
EventUtils.event("ad_expire", ext = obj2)
onHidden?.invoke()
loadInterstitialAd(activity)
return
......@@ -122,7 +122,7 @@ object AdMaxInterstitialUtils {
val obj1 = JSONObject()
obj1.put("ad_unit", "interAd")
EventHelper.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show", ext = obj1)
isInterOpenShowing = false
if (interstitialAd?.isReady == true) {
......@@ -134,7 +134,7 @@ object AdMaxInterstitialUtils {
val obj2 = JSONObject()
obj2.put("reason", "no cache ad")
obj2.put("ad_unit", "interAd")
EventHelper.event("ad_nocache_pull", ext = obj2)
EventUtils.event("ad_nocache_pull", ext = obj2)
val loaded = loadInterstitialAd(activity)
if (loaded) {
LogEx.logDebug(TAG, "loaded=true")
......@@ -185,7 +185,7 @@ object AdMaxInterstitialUtils {
val obj = JSONObject()
obj.put("req_id", reqId)
obj.put("ad_type", "interAd")
EventHelper.event("ad_pull_start", ext = obj)
EventUtils.event("ad_pull_start", ext = obj)
interstitialAd?.loadAd()
AdDisplayUtils.getInstance().incrementAdRequestCount()
return true
......
app/src/main/java/com/base/browserwhite/ads/max/AdMaxNativeUtils.kt
View file @ 2daabdee
......@@ -14,7 +14,7 @@ import com.base.browserwhite.MyApplication
import com.base.browserwhite.R
import com.base.browserwhite.ads.AdDisplayUtils
import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import org.json.JSONObject
......@@ -56,7 +56,7 @@ object AdMaxNativeUtils {
val obj2 = JSONObject()
obj2.put("reason", "no_ad")
obj2.put("ad_unit", "nativeAd")
EventHelper.event("ad_show_error", ext = obj2)
EventUtils.event("ad_show_error", ext = obj2)
}
override fun onNativeAdClicked(p0: MaxAd) {
......
app/src/main/java/com/base/browserwhite/ads/max/AdMaxOpenUtils.kt
View file @ 2daabdee
......@@ -8,7 +8,7 @@ import com.applovin.mediation.ads.MaxAppOpenAd
import com.base.browserwhite.ads.AdDisplayUtils
import com.base.browserwhite.ads.AdmobMaxHelper.isInterOpenShowing
import com.base.browserwhite.help.ConfigHelper
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.LogEx
import org.json.JSONObject
import java.util.UUID
......@@ -71,7 +71,7 @@ object AdMaxOpenUtils {
obj.put("code", p1.code)
obj.put("reason", p1.message)
obj.put("ad_unit", "openAd")
EventHelper.event("ad_show_error", ext = obj)
EventUtils.event("ad_show_error", ext = obj)
isInterOpenShowing = false
}
......@@ -110,7 +110,7 @@ object AdMaxOpenUtils {
onHidden?.invoke()
val obj2 = JSONObject()
obj2.put("ad_unit", "openAd")
EventHelper.event("ad_expire", ext = obj2)
EventUtils.event("ad_expire", ext = obj2)
appOpenAd?.loadAd()
}
......@@ -124,7 +124,7 @@ object AdMaxOpenUtils {
LogEx.logDebug(TAG, "showAppOpenAd")
val obj1 = JSONObject()
obj1.put("ad_unit", "openAd")
EventHelper.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show", ext = obj1)
isInterOpenShowing = false
......@@ -136,7 +136,7 @@ object AdMaxOpenUtils {
val obj = JSONObject()
obj.put("reason", "no cache ad")
obj.put("ad_unit", "openAd")
EventHelper.event("ad_nocache_pull", ext = obj)
EventUtils.event("ad_nocache_pull", ext = obj)
LogEx.logDebug(TAG, "展示时候，发现广告需要拉取")
val loaded = loadAppOpenAd(activity)
if (loaded) {
......@@ -169,7 +169,7 @@ object AdMaxOpenUtils {
val obj = JSONObject()
obj.put("req_id", reqId)
obj.put("ad_type", "openAd")
EventHelper.event("ad_pull_start", ext = obj)
EventUtils.event("ad_pull_start", ext = obj)
appOpenAd?.loadAd()
AdDisplayUtils.getInstance().incrementAdRequestCount()
return true
......
app/src/main/java/com/base/browserwhite/fcm/FCMManager.java
View file @ 2daabdee
......@@ -5,7 +5,7 @@ import android.util.Log;
import androidx.annotation.NonNull;
import com.base.browserwhite.help.EventHelper;
import com.base.browserwhite.help.EventUtils;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.FirebaseApp;
......@@ -24,7 +24,7 @@ public class FCMManager {
public void onComplete(@NonNull Task<Void> task) {
if (task.isSuccessful()) {
Log.d("FCMUtil", "suc:" + topic);
EventHelper.INSTANCE.event("FCM_Topic_" + topic, null, null, false);
EventUtils.INSTANCE.event("FCM_Topic_" + topic, null, null, false);
} else {
Log.d("FCMUtil", "fail");
}
......
app/src/main/java/com/base/browserwhite/fcm/MessagingService.java
View file @ 2daabdee
......@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import androidx.annotation.NonNull;
import com.base.browserwhite.help.EventHelper;
import com.base.browserwhite.help.EventUtils;
import com.base.browserwhite.utils.AppPreferences;
import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
......@@ -23,7 +23,7 @@ public class MessagingService extends FirebaseMessagingService {
// manageTimerBasedOnMessage(remoteMessage.getData());
// AdDisplayUtils.getInstance().saveSp();
EventHelper.INSTANCE.event("FCM_Received", null, null, false);
EventUtils.INSTANCE.event("FCM_Received", null, null, false);
sendLocalNotification();
}
......
app/src/main/java/com/base/browserwhite/fcm/NotificationUtil.kt
View file @ 2daabdee
......@@ -21,7 +21,7 @@ import com.base.browserwhite.bean.ConstObject.ID_CLEAN_JUNK_MEMORY
import com.base.browserwhite.bean.ConstObject.ID_JUNK_CLEANER
import com.base.browserwhite.bean.ConstObject.ID_NEWS
import com.base.browserwhite.bean.NewsBean
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.help.NewsUtils.getNews
import com.base.browserwhite.ui.activity.cleanjunk.ScanJunkActivity.Companion.fastGetJunkSize
import com.base.browserwhite.ui.activity.splash.Splash2Activity
......@@ -221,7 +221,7 @@ object NotificationUtil {
}
sendNotification(context, actionId)
EventHelper.event("showNotification", where, null, false)
EventUtils.event("showNotification", where, null, false)
AppPreferences.getInstance().putInt("notificationCount_${getCurrentDate()}", todayShowCount + 1)
......
app/src/main/java/com/base/browserwhite/help/EventHelper.kt → app/src/main/java/com/base/browserwhite/help/EventUtils.kt
View file @ 2daabdee
......@@ -9,7 +9,7 @@ import com.base.browserwhite.utils.LogEx
import org.json.JSONException
import org.json.JSONObject
object EventHelper {
object EventUtils {
private val TAG = "EventUtils"
fun event(
key: String,
......
app/src/main/java/com/base/browserwhite/help/InstallHelper.kt
View file @ 2daabdee
......@@ -46,7 +46,7 @@ object InstallHelps {
obj.put("referrerClickTime", response.referrerClickTimestampSeconds)
obj.put("appInstallTime", response.installBeginTimestampSeconds)
obj.put("instantExperienceLaunched", installInfo.toString())
EventHelper.event("install_referrer", ext = obj, isSingleEvent = true)
EventUtils.event("install_referrer", ext = obj, isSingleEvent = true)
AppPreferences.getInstance().put("referrer", response.installReferrer)
if (listOf("gclid", "facebook", "instagram").all { !installInfo.contains(it, true) }) {
//自然用户
......@@ -63,12 +63,12 @@ object InstallHelps {
}
else -> {
EventHelper.event("install_referrer_error")
EventUtils.event("install_referrer_error")
requestCfg(true)
}
}
} catch (_: Exception) {
EventHelper.event("install_referrer_error")
EventUtils.event("install_referrer_error")
}
}
......
app/src/main/java/com/base/browserwhite/help/NewComUtils.kt
View file @ 2daabdee
......@@ -116,7 +116,7 @@ object NewComUtils {
val jsonObject = JSONObject()
jsonObject.put("ut", AppPreferences.getInstance().getString("ut", ""))
EventHelper.event("user_type", ext = jsonObject)
EventUtils.event("user_type", ext = jsonObject)
AdDisplayUtils.getInstance().saveSp()
}
......
app/src/main/java/com/base/browserwhite/service/StayNotificationService.kt
View file @ 2daabdee
......@@ -18,7 +18,7 @@ import androidx.core.graphics.drawable.IconCompat
import com.base.browserwhite.R
import com.base.browserwhite.bean.ConstObject
import com.base.browserwhite.ui.activity.MainActivity
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.ui.activity.splash.Splash2Activity
import kotlin.random.Random
......@@ -59,7 +59,7 @@ class StayNotificationService : Service() {
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
if (intent == null) {
EventHelper.event("onStartCommand", "Foreground System auto launch intent=null isRunning=$isRunning")
EventUtils.event("onStartCommand", "Foreground System auto launch intent=null isRunning=$isRunning")
return START_NOT_STICKY
}
if (!isRunning) {
......
app/src/main/java/com/base/browserwhite/ui/activity/BaseActivity.kt
View file @ 2daabdee
......@@ -5,6 +5,7 @@ import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.viewbinding.ViewBinding
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.utils.ActivityLauncher
import com.base.browserwhite.utils.ActivityManagerUtils
......@@ -21,7 +22,7 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
launcher = ActivityLauncher(this)
setContentView(binding.root)
// EventUtils.event("page_${javaClass.simpleName}")
EventUtils.event("page_${javaClass.simpleName}")
initView()
initListener()
}
......
app/src/main/java/com/base/browserwhite/ui/activity/splash/Splash2Activity.kt
View file @ 2daabdee
......@@ -20,7 +20,7 @@ import com.base.browserwhite.ads.AdmobMaxHelper
import com.base.browserwhite.bean.ConstObject.ifAgreePrivacy
import com.base.browserwhite.databinding.ActivitySplash2Binding
import com.base.browserwhite.fcm.NotificationUtil
import com.base.browserwhite.help.EventHelper
import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.help.WeatherUtils
import com.base.browserwhite.service.StayNotificationService.Companion.startStayNotification
import com.base.browserwhite.ui.activity.BaseActivity
......@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
@SuppressLint("CustomSplashScreen")
class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
PrivacyManager.onUserPrivacyAggreementListener, TaskManager.ProgressListener {
private val TAG = "NewStartActivity"
private val TAG = "Splash2Activity"
private fun initStatusBar() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
......@@ -47,7 +47,7 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK) {
EventHelper.event("back")
EventUtils.event("back")
}
return super.onKeyDown(keyCode, event)
}
......@@ -185,7 +185,7 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
}
override fun onAgreePrivacy(isStart: Boolean) {
EventHelper.event("app_start")
EventUtils.event("app_start")
if (jumpType == 0) {
startStayNotification()
}
......@@ -240,13 +240,13 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
override fun onPause() {
super.onPause()
isPause = true
EventHelper.event("onPause")
EventUtils.event("onPause")
}
override fun onResume() {
super.onResume()
isPause = false
EventHelper.event("onResume")
EventUtils.event("onResume")
}
override fun onStop() {
......
app/src/main/res/layout/activity_news.xml
View file @ 2daabdee
......@@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:layout_marginVertical="10dp"
android:layout_marginVertical="5dp"
android:layout_marginStart="15dp"
android:text="News"
android:textColor="@color/black"
......
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