修改广告，修改bug

app/build.gradle

@@ -123,5 +123,6 @@ dependencies {
     implementation 'com.applovin.mediation:facebook-adapter:+'
     implementation 'com.applovin.mediation:mintegral-adapter:+'
     implementation 'com.applovin.mediation:bytedance-adapter:+'
+    implementation("com.blankj:utilcodex:1.31.1")
 
 }
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/MyApplication.kt

 package com.test.easy.easycleanerjunk
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import com.applovin.sdk.AppLovinMediationProvider
 import com.applovin.sdk.AppLovinSdk
 import com.applovin.sdk.AppLovinSdkInitializationConfiguration
 import com.google.android.gms.ads.MobileAds
-import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity
 import com.test.easy.easycleanerjunk.fcm.ActionBroadcast
 import com.test.easy.easycleanerjunk.fcm.FCMUtil
@@ -20,9 +19,8 @@ import com.test.easy.easycleanerjunk.helps.ConfigHelper
 import com.test.easy.easycleanerjunk.helps.InstallHelps
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
-import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils
 import com.test.easy.easycleanerjunk.utils.SPUtils
-import java.util.Collections
+import com.test.easy.easycleanerjunk.utils.UtilsBridge
 import java.util.UUID
 import java.util.concurrent.Executors
 
@@ -59,12 +57,12 @@ class MyApplication : BaseApplication(), Application.ActivityLifecycleCallbacks
                     val initConfigBuilder = AppLovinSdkInitializationConfiguration.builder(
                         "GGPreND6SRmCt1zJgn5faiLGD8c2PVGPLgPpSg7cHanVTud1DhtuI9MmteTqlEviaJ57WnxW68kQDaATJ5z3cW",
                         context
-                    ).setMediationProvider(AppLovinMediationProvider.ADMOB)
-                    val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(context).id
-                    if (currentGaid != null) {
-                        initConfigBuilder.testDeviceAdvertisingIds =
-                            Collections.singletonList(currentGaid)
-                    }
+                    ).setMediationProvider(AppLovinMediationProvider.MAX)
+//                    val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(context).id
+//                    if (currentGaid != null) {
+//                        initConfigBuilder.testDeviceAdvertisingIds =
+//                            Collections.singletonList(currentGaid)
+//                    }
                     val initConfig = initConfigBuilder.build()
                     // Initialize the SDK with the configuration
                     AppLovinSdk.getInstance(context).initialize(initConfig) {
@@ -93,15 +91,17 @@ class MyApplication : BaseApplication(), Application.ActivityLifecycleCallbacks
     }
 
     private var count = 0
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        Log.e("MXL", "onActivityCreated: "+activity.localClassName )
+    }
 
     override fun onActivityStarted(activity: Activity) {
         count++
         lastTimeResume = System.currentTimeMillis()
         if (count == 1 && isHotLaunch()) {
 
-            val topActivity: Activity? = ActivityManagerUtils.getInstance().topActivity
-
+            //val topActivity: Activity? = ActivityManagerUtils.getInstance().topActivity
+            val topActivity= UtilsBridge.getTopActivity()
             var flag = if (topActivity == null) {
                 true
             } else {

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/NewSplashActivity.kt

@@ -22,7 +22,6 @@ import com.test.easy.easycleanerjunk.utils.BarUtils
 @SuppressLint("CustomSplashScreen")
 class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
     PrivacyAgreementManager.onUserPrivacyAggreementListener, ProgressManager.ProgressListener {
-    private val TAG = "NewSplashActivity"
     private fun initStatusBar() {
         BarUtils.setStatusBarLightMode(this, true)
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/ProgressManager.kt

@@ -3,7 +3,9 @@ package com.test.easy.easycleanerjunk.activity.splash
 import android.os.Handler
 import androidx.core.view.isVisible
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutSplashBinding
+import com.test.easy.easycleanerjunk.helps.EventUtils
 import com.test.easy.easycleanerjunk.utils.SPUtils
+import org.json.JSONObject
 
 class ProgressManager {
 
@@ -42,11 +44,15 @@ class ProgressManager {
                 if (!mIsPaused) {
                     mProgress++ // 计算进度
                     binding.pb.progress = mProgress
-                    if (mProgress < 9) {
+                    if (mProgress < loadTime) {
                         mHandler.postDelayed(this, 1000) // 每秒钟更新一次进度
                     } else {
                         listener.onProgressMax()
                         pauseProgress()
+                        val obj = JSONObject()
+                        obj.put("reason", "timeout")
+                        obj.put("ad_unit", "openAd")
+                        EventUtils.event("ad_show_error", ext = obj)
                     }
                 }
             }

app/src/main/java/com/test/easy/easycleanerjunk/helps/ConfigHelper.kt

@@ -35,6 +35,7 @@ object ConfigHelper {
     val noLoadingActivities = listOf(
         "full", // 过滤全屏广告
         "adActivity",
+        "AdActivity",
         "AppLovinFullscreenActivity",
         NewSplashActivity::class.java.simpleName
         // 返回前台时不跳转启动页的 activity

app/src/main/java/com/test/easy/easycleanerjunk/helps/ads/MaxAdUtils.kt

@@ -84,7 +84,7 @@ object MaxAdUtils {
                     mOpenAd=null
                     onLoad?.invoke()
                     maxAdPullReport(null, "AppOpenAd", p1.message)
-                    Log.e("MXL", "onAdLoadFailed: " + p1)
+                   // Log.e("MXL", "onAdLoadFailed: " + p1)
                     AdDisplayUtils.getInstance().incrementAdRequestFailCount()
                 }
 
@@ -159,10 +159,10 @@ object MaxAdUtils {
         } else {
             onHidden?.invoke()
             mOpenAd?.loadAd()
-            val obj = JSONObject()
-            obj.put("reason", "no_ad")
-            obj.put("ad_unit", "openAd")
-            EventUtils.event("ad_show_error", ext = obj)
+//            val obj = JSONObject()
+//            obj.put("reason", "no_ad")
+//            obj.put("ad_unit", "openAd")
+//            EventUtils.event("ad_show_error", ext = obj)
         }
     }
 
@@ -223,6 +223,7 @@ object MaxAdUtils {
                 maxAdPullReport(null, "InterstitialAd", p1.message)
                 onLoad?.invoke()
                 AdDisplayUtils.getInstance().incrementAdRequestFailCount()
+                Log.e("MXL", "onAdLoadFailed: "+p1.message )
 //                retryAttempt++
 //                Handler(Looper.getMainLooper()).postDelayed({
 //                    retryAttempt++