[修改]广告代码修改

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

@@ -156,8 +156,8 @@ object AdsMgr {
      */
     fun showOpen(
         activity: Activity,
-        isUnLimit: Boolean = false,
         showCallBack: AdsShowCallBack? = null,
+        isUnLimit: Boolean = false,
     ) {
         if (configBean.isInBlackList) {
             EventUtils.event("isInBlackList", "isInBlackList=${configBean.isInBlackList}")
@@ -195,8 +195,8 @@ object AdsMgr {
      */
     fun showInsert(
         activity: Activity,
-        isUnLimit: Boolean = false,
         showCallBack: AdsShowCallBack? = null,
+        isUnLimit: Boolean = false,
     ) {
         if (configBean.isInBlackList) {
             EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
@@ -238,7 +238,6 @@ object AdsMgr {
         }
     }
 
-    fun isNativeShow() = LimitUtils.isAdShow(AdsType.NATIVE, null)
 
     /**
      * 展示banner广告

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

@@ -62,7 +62,7 @@ class AdInterMgr {
         val needLoad = adState.currentAd == null || !adAvailable()
         if (needLoad) {
             if (!adState.loadingAd) {
-                loadAd(activity, isUnLimit, adEvent)
+                loadAd(activity, adEvent, isUnLimit)
             }
         } else {
             showReadyAd(adEvent)
@@ -103,7 +103,7 @@ class AdInterMgr {
 
                     showCallBack?.close()
                     showCallBack = null
-                    loadAd(MyApplication.appContext, false, AdmobEvent("interAd", "preload"))
+                    loadAd(MyApplication.appContext, AdmobEvent("interAd", "preload"))
                 }
 
                 override fun onAdClicked() {
@@ -121,7 +121,7 @@ class AdInterMgr {
     fun loadAd(
         context: Context,
         adEvent: AdEvent,
-        isUnLimit: Boolean=false,
+        isUnLimit: Boolean = false,
     ) {
         if (!isUnLimit) {
             if (!LimitUtils.isAdShow(AdsType.INSERT, adEvent)) {

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

@@ -3,6 +3,7 @@ package com.base.appzxhy.ads.admob
 import com.base.appzxhy.GlobalConfig
 import com.base.appzxhy.ads.AdsType
 import com.base.appzxhy.ads.LimitUtils
+import com.base.appzxhy.ads.NativeParentView
 import com.google.android.gms.ads.AdListener
 import com.google.android.gms.ads.AdLoader
 import com.google.android.gms.ads.AdRequest

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

@@ -54,7 +54,7 @@ class AdOpenMgr {
         val needLoad = adState.currentAd == null || !adAvailable()
         if (needLoad) {
             if (!adState.loadingAd) {
-                loadAd(activity, isUnLimit, adEvent)
+                loadAd(activity, adEvent, isUnLimit)
             }
         } else {
             showReadyAd(adEvent)
@@ -96,7 +96,7 @@ class AdOpenMgr {
                     adState.onAdHidden()
 
                     //预加载,“Timeout for show call succeed.”预加载的广告大概率,
-                    loadAd(MyApplication.appContext, false, AdmobEvent("openAd", "preload"))
+                    loadAd(MyApplication.appContext, AdmobEvent("openAd", "preload"))
 
                 }
 

app/src/main/java/com/base/appzxhy/ads/applovin/MaxInsertMgr.kt

@@ -57,12 +57,12 @@ class MaxInsertMgr {
             }
 
             if (!adAvailable() || adState.currentAd == null) {
-                loadAd(activity, isUnLimit, adEvent)
+                loadAd(activity, adEvent, isUnLimit)
                 return
             }
 
             if (adState.currentAd?.isReady == false) {
-                loadAd(activity, isUnLimit, adEvent)
+                loadAd(activity, adEvent, isUnLimit)
                 return
             }
             showReadyAd(adEvent)
@@ -100,7 +100,7 @@ class MaxInsertMgr {
                     adState.onAdHidden()
                     showCallBack?.close()
 
-                    loadAd(activity.applicationContext, false, AdMaxEvent("interAd", "preload"))
+                    loadAd(activity.applicationContext, AdMaxEvent("interAd", "preload"))
                 }
 
                 override fun onAdClicked(ad: MaxAd) {
@@ -121,7 +121,7 @@ class MaxInsertMgr {
     fun loadAd(
         context: Context,
         adEvent: AdEvent,
-        isUnLimit: Boolean=false,
+        isUnLimit: Boolean = false,
     ) {
         if (!isUnLimit) {
             if (!LimitUtils.isAdShow(AdsType.INSERT, adEvent)) {

app/src/main/java/com/base/appzxhy/drouterimp/InterAdServiceImp.kt

@@ -15,19 +15,10 @@ class InterAdServiceImp : InterAdService {
 
         if (AdConfigBean.adsConfigBean.functionInShowAd) {
             AdsMgr.showInsert(activity, object : AdsShowCallBack() {
-                override fun close(where: Int) {
+                override fun next() {
                     callBack.invoke()
                 }
 
-                override fun failed(where: Int) {
-                    callBack.invoke()
-                }
-
-                override fun adFailed(where: Int) {
-                    callBack.invoke()
-
-                }
-
             })
         } else {
             callBack.invoke()
@@ -39,15 +30,7 @@ class InterAdServiceImp : InterAdService {
 
         if (AdConfigBean.adsConfigBean.functionBackShowAd) {
             AdsMgr.showInsert(activity, object : AdsShowCallBack() {
-                override fun close(where: Int) {
-                    callBack.invoke()
-                }
-
-                override fun failed(where: Int) {
-                    callBack.invoke()
-                }
-
-                override fun adFailed(where: Int) {
+                override fun next() {
                     callBack.invoke()
                 }
             })

app/src/main/java/com/base/appzxhy/drouterimp/NativeAdServiceImp.kt

@@ -21,7 +21,7 @@ class NativeAdServiceImp : NativeAdService {
             else -> R.layout.layout_admob_native_custom
         }
         val maxLayout = R.layout.layout_max_native_custom
-        AdsMgr.showNative(activity, flAd, admobLayout, maxLayout)
+//        AdsMgr.showNative(activity, flAd, admobLayout, maxLayout)
     }