[商业化]优化广告逻辑

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

@@ -76,27 +76,27 @@ class AdInterMgr {
             if (!adState.loadingAd) {
                 LogEx.logDebug(adEvent.TAG, "inter adState !loadingAd")
                 loadAd(activity, nowAdEvent) {
-                    showReadyAd(activity)
+                    showReadyAd(activity, nowAdEvent)
                 }
             } else {
                 LogEx.logDebug(adEvent.TAG, "inter adState is loadingAd")
                 loadingCallBack = {
-                    showReadyAd(activity)
+                    showReadyAd(activity, nowAdEvent)
                 }
             }
         } else {
             LogEx.logDebug(adEvent.TAG, "inter ad ready")
-            showReadyAd(activity)
+            showReadyAd(activity, nowAdEvent)
         }
 
     }
 
 
-    private fun showReadyAd(ac: Activity) {
+    private fun showReadyAd(ac: Activity, adEvent: AdEvent) {
 
-        val adEvent = (adState.currentAdEvent as AdmobEvent?)
 //        val ac = adState.activityRef?.get()
-        val tag = adEvent?.TAG ?: ""
+        val admobEvent = (adEvent as AdmobEvent)
+        val tag = adEvent.TAG
 
         LogEx.logDebug(tag, "showReadyAd ac=$ac currentAd=${adState.currentAd}")
         if (ac.isFinishing || ac.isDestroyed || adState.currentAd == null) {
@@ -112,7 +112,7 @@ class AdInterMgr {
                 override fun onAdShowedFullScreenContent() {
                     super.onAdShowedFullScreenContent()
 
-                    adEvent?.showAd(responseInfo, ac)
+                    admobEvent.showAd(responseInfo, ac)
 
                     adState.onAdDisplayed()
                     showCallBack?.show()
@@ -127,7 +127,7 @@ class AdInterMgr {
                     showCallBack?.adFailed()
                     showCallBack = null
 
-                    adEvent?.adShowError(adError)
+                    admobEvent.adShowError(adError)
                 }
 
                 override fun onAdDismissedFullScreenContent() {
@@ -142,7 +142,7 @@ class AdInterMgr {
 
                 override fun onAdClicked() {
                     super.onAdClicked()
-                    adEvent?.clickAd(responseInfo)
+                    admobEvent.clickAd(responseInfo)
                     //计数
                     LimitUtils.addClickNum()
                 }