[商业化]上报链

app/src/main/java/com/base/appzxhy/business/ads/AdsMgr.kt

@@ -111,8 +111,8 @@ object AdsMgr {
             if (adsConfigBean.adSwitch) {
                 admobInitCallBack?.invoke()
                 admobInitCallBack = null
-                adNativeMgr.loadAd(MyApplication.appContext, AdmobEvent("nativeAd", "preload"), null)
-//                adOpenMgr.loadAd(context, true, AdmobEvent("openAd", context::class.java.simpleName))
+                adNativeMgr.loadAd(context, AdmobEvent("nativeAd", context::class.java.simpleName))
+                adOpenMgr.loadAd(context, AdmobEvent("openAd", context::class.java.simpleName))
                 adInterMgr.loadAd(context, AdmobEvent("interAd", context::class.java.simpleName))
             }
         }

app/src/main/java/com/base/appzxhy/business/ads/admob/AdInterMgr.kt

@@ -96,10 +96,13 @@ class AdInterMgr {
 
     private fun showReadyAd() {
 
+        val adEvent = (adState.currentAdEvent as AdmobEvent?)
         val ac = adState.activityRef?.get()
-        LogEx.logDebug("AdmobEvent", "inter showReadyAd ac=$ac currentAd=${adState.currentAd}")
+        val tag = adEvent?.TAG ?: ""
+
+        LogEx.logDebug(tag, "showReadyAd ac=$ac currentAd=${adState.currentAd}")
         if (ac == null || ac.isFinishing || ac.isDestroyed) {
-            LogEx.logDebug(TAG, "showReadyAd ac=null isFinishing isDestroyed")
+            LogEx.logDebug(tag, "showReadyAd ac=null isFinishing isDestroyed")
             showCallBack?.failed()
             adState.onAdDisplayFailed()
             return
@@ -107,8 +110,6 @@ class AdInterMgr {
 
         adState.currentAd?.run {
 
-            val adEvent = (adState.currentAdEvent as AdmobEvent?)
-
             fullScreenContentCallback = object : FullScreenContentCallback() {
                 override fun onAdShowedFullScreenContent() {
                     super.onAdShowedFullScreenContent()