【广告组件】更新广告相关组件sdk版本

app/build.gradle

@@ -129,32 +129,31 @@ dependencies {
     implementation project(':lib_ad_gromore_adn')
     implementation project(':lib_pdf_base')
 
-    implementation "com.pangle.cn:mediation-sdk:5.6.0.8"
-//    implementation "com.pangle.cn:tools-release:5.6.0.8"
-    implementation "com.pangle.cn:mediation-gdt-adapter:4.540.1410.2"
-    implementation "com.pangle.cn:mediation-baidu-adapter:9.313.2"
-    implementation "com.pangle.cn:mediation-klevin-adapter:2.11.0.3.11"//游可赢 adapter
-    implementation "com.pangle.cn:mediation-mintegral-adapter:16.4.47.4"//mintegral adapter
-    implementation "com.pangle.cn:mediation-sigmob-adapter:4.12.6.1"
+    implementation "com.pangle.cn:mediation-sdk:5.8.0.7"
+    implementation "com.pangle.cn:mediation-gdt-adapter:4.550.1420.2"
+    implementation "com.pangle.cn:mediation-baidu-adapter:9.324.0"
+    implementation "com.pangle.cn:mediation-klevin-adapter:2.11.0.3.14"//游可赢 adapter
+    implementation "com.pangle.cn:mediation-mintegral-adapter:16.5.47.0"//mintegral adapter
+    implementation "com.pangle.cn:mediation-sigmob-adapter:4.12.9.0"
 
 
     //mintegral
-    api("com.mbridge.msdk.support:videojs:16.4.47")
-    api("com.mbridge.msdk.support:mbjscommon:16.4.47")
-    api("com.mbridge.msdk.support:playercommon:16.4.47")
-    api("com.mbridge.msdk.support:reward:16.4.47")
-    api("com.mbridge.msdk.support:videocommon:16.4.47")
-    api("com.mbridge.msdk.support:chinasame:16.4.47")
-    api("com.mbridge.msdk.support:interstitialvideo:16.4.47")
-    api("com.mbridge.msdk.support:mbnative:16.4.47")
-    api("com.mbridge.msdk.support:nativeex:16.4.47")
-    api("com.mbridge.msdk.support:mbnativeadvanced:16.4.47")
-    api("com.mbridge.msdk.support:interstitial:16.4.47")
-    api("com.mbridge.msdk.support:mbbanner:16.4.47")
-    api("com.mbridge.msdk.support:mbsplash:16.4.47")
-    api("com.mbridge.msdk.support:mbbid:16.4.47")
-    api("com.mbridge.msdk.support:newinterstitial:16.4.47")
-
-    implementation 'com.qq.e.union:union:4.540.1410'
+    api("com.mbridge.msdk.support:videojs:16.5.47")
+    api("com.mbridge.msdk.support:mbjscommon:16.5.47")
+    api("com.mbridge.msdk.support:playercommon:16.5.47")
+    api("com.mbridge.msdk.support:reward:16.5.47")
+    api("com.mbridge.msdk.support:videocommon:16.5.47")
+    api("com.mbridge.msdk.support:chinasame:16.5.47")
+    api("com.mbridge.msdk.support:interstitialvideo:16.5.47")
+    api("com.mbridge.msdk.support:mbnative:16.5.47")
+    api("com.mbridge.msdk.support:nativeex:16.5.47")
+    api("com.mbridge.msdk.support:mbnativeadvanced:16.5.47")
+    api("com.mbridge.msdk.support:interstitial:16.5.47")
+    api("com.mbridge.msdk.support:mbbanner:16.5.47")
+    api("com.mbridge.msdk.support:mbsplash:16.5.47")
+    api("com.mbridge.msdk.support:mbbid:16.5.47")
+    api("com.mbridge.msdk.support:newinterstitial:16.5.47")
+
+    implementation 'com.qq.e.union:union:4.551.1421'
 
 }

app/src/main/java/com/convenient/android/lib/ui/sample/ad/AdMainActivity.kt

@@ -35,7 +35,7 @@ class AdMainActivity : AppCompatActivity() {
 
     private fun initAd() {
         AdManager.instance.init(applicationContext, true)
-        AdManager.instance.initAdvertisersSDK(applicationContext, AdmobInitialize(), GroMoreInitialize("5091848"), AppLovinMaxInitialize())
+        AdManager.instance.initAdvertisersSDK(applicationContext, AdmobInitialize(), GroMoreInitialize("5089223"), AppLovinMaxInitialize())
         AdManager.instance.addGlobalAdShowListener {
             adLogWithFrame(
                 tag = "广告全局展示监听", msgs = arrayOf(

app/src/main/java/com/convenient/android/lib/ui/sample/ad/model/Datas.kt

@@ -70,9 +70,9 @@ object Datas {
 
     val GroMoreAdUnitList: List<AdUnitBean> =
         listOf(
-            AdUnitBean(BANNER, Advertisers.GroMore.name, AdType.BANNER.name, "947908621", adSize = AdSize(LibApplication.context.getScreenWidth(), 600)),
+            AdUnitBean(BANNER, Advertisers.GroMore.name, AdType.BANNER.name, "102221168", adSize = AdSize(LibApplication.context.getScreenWidth(), 600)),
             AdUnitBean(INTERSTITIAL, Advertisers.GroMore.name, AdType.INTERSTITIAL.name, "948013677"),
-            AdUnitBean(APP_OPEN, Advertisers.GroMore.name, AdType.APP_OPEN.name, "887697676"),
+            AdUnitBean(APP_OPEN, Advertisers.GroMore.name, AdType.APP_OPEN.name, "887622184"),
             AdUnitBean(REWARDED_VIDEO, Advertisers.GroMore.name, AdType.REWARDED_VIDEO.name, "102137844"),
             AdUnitBean(NATIVE_TEMPLATE, Advertisers.GroMore.name, AdType.NATIVE_TEMPLATE.name, "945947744", adSize = AdSize(widthPx = (getScreenWidth(LibApplication.context) * 0.9F).toInt(), heightPx = px2dip(LibApplication.context, (getScreenWidth(LibApplication.context).toFloat() * 0.702F - 20)))),
             AdUnitBean(FEED, Advertisers.GroMore.name, AdType.FEED.name, "102217511", adSize =

app/src/main/java/com/convenient/android/lib/ui/sample/ad/page/AdHomePage.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.applovin.sdk.AppLovinSdk
 import com.bumptech.glide.Glide
+import com.bytedance.mtesttools.api.TTMediationTestTool
 import com.composition.android.lib.ad.basic.Advertisers
 import com.convenient.android.common.extension.readyGo
 import com.convenient.android.lib.ui.sample.ad.activity.*
@@ -180,11 +181,11 @@ private fun groMoreItems(context: Context) {
         }
     }
     Item(modifier = modifier, title = "GroMore 中介测试套件") {
-//        TTMediationTestTool.launchTestTools(context) { imageView, s ->
-//            Glide.with(context)
-//                .load(s)
-//                .into(imageView)
-//        }
+        TTMediationTestTool.launchTestTools(context) { imageView, s ->
+            Glide.with(context)
+                .load(s)
+                .into(imageView)
+        }
     }
 }
 

lib_ad_admob/build.gradle

@@ -58,5 +58,5 @@ android {
 dependencies {
     implementation project(':lib_ad_core')
 
-    api 'com.google.android.gms:play-services-ads:22.4.0'
+    api 'com.google.android.gms:play-services-ads:22.5.0'
 }

lib_ad_applovinmax/build.gradle

@@ -41,6 +41,6 @@ android {
 dependencies {
     implementation project(':lib_ad_core')
 
-    api 'com.applovin:applovin-sdk:11.10.1'
+    api 'com.applovin:applovin-sdk:12.0.0'
     api "com.google.android.gms:play-services-ads-identifier:18.0.1"
 }

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/AppLovinMaxLoader.kt

@@ -183,31 +183,31 @@ class AppLovinMaxLoader : AdLoader {
             val maxInterstitialAd = adResult.adObject as? MaxInterstitialAd
             if (maxInterstitialAd?.isReady == true) {
                 maxInterstitialAd.setListener(object : MaxAdListener{
-                    override fun onAdLoaded(ad: MaxAd?) {
+                    override fun onAdLoaded(ad: MaxAd) {
 
                     }
 
-                    override fun onAdDisplayed(ad: MaxAd?) {
+                    override fun onAdDisplayed(ad: MaxAd) {
                         AdManager.instance.globalListener?.invoke(adResult.adBean)
                         adListener.onAdShow(adResult.adBean)
                         adLogWithFrame(msg = "AppLovinMax广告-插屏-显示")
                     }
 
-                    override fun onAdHidden(ad: MaxAd?) {
+                    override fun onAdHidden(ad: MaxAd) {
                         adListener.onAdClose()
                         adLogWithFrame(msg = "AppLovinMax广告-插屏-关闭")
                         destroyAd(adResult)
                     }
 
-                    override fun onAdClicked(ad: MaxAd?) {
+                    override fun onAdClicked(ad: MaxAd) {
                         adListener.onAdClick()
                         adLogWithFrame(msg = "AppLovinMax广告-插屏-点击")
                     }
 
-                    override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
+                    override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
                     }
 
-                    override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                    override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                         adListener.onAdShowFail("AppLovinMax广告-插屏-显示失败-${error?.message}")
                         adLogWithFrame(msg = "AppLovinMax广告-插屏-显示失败")
                     }
@@ -228,44 +228,44 @@ class AppLovinMaxLoader : AdLoader {
             val maxRewardedAd = adResult.adObject as? MaxRewardedAd
             if (maxRewardedAd?.isReady == true) {
                 maxRewardedAd.setListener(object : MaxRewardedAdListener{
-                    override fun onAdLoaded(ad: MaxAd?) {
+                    override fun onAdLoaded(ad: MaxAd) {
 
                     }
 
-                    override fun onAdDisplayed(ad: MaxAd?) {
+                    override fun onAdDisplayed(ad: MaxAd) {
                         AdManager.instance.globalListener?.invoke(adResult.adBean)
                         adListener.onAdShow(adResult.adBean)
                         adLogWithFrame(msg = "AppLovinMax广告-激励-显示")
                     }
 
-                    override fun onAdHidden(ad: MaxAd?) {
+                    override fun onAdHidden(ad: MaxAd) {
                         adListener.onAdClose()
                         adLogWithFrame(msg = "AppLovinMax广告-激励-关闭")
                         destroyAd(adResult)
                     }
 
-                    override fun onAdClicked(ad: MaxAd?) {
+                    override fun onAdClicked(ad: MaxAd) {
                         adListener.onAdClick()
                         adLogWithFrame(msg = "AppLovinMax广告-激励-点击")
                     }
 
-                    override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
+                    override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
                     }
 
-                    override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                    override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                         adListener.onAdShowFail("AppLovinMax广告-激励-显示失败-${error?.message}")
                         adLogWithFrame(msg = "AppLovinMax广告-激励-显示失败")
                     }
 
-                    override fun onUserRewarded(ad: MaxAd?, reward: MaxReward?) {
+                    override fun onUserRewarded(ad: MaxAd, reward: MaxReward) {
                         adLogWithFrame(msg = "AppLovinMax广告-激励-下发奖励")
                         adListener.onAdRewarded()
                     }
 
-                    override fun onRewardedVideoStarted(ad: MaxAd?) {
+                    override fun onRewardedVideoStarted(ad: MaxAd) {
                     }
 
-                    override fun onRewardedVideoCompleted(ad: MaxAd?) {
+                    override fun onRewardedVideoCompleted(ad: MaxAd) {
                     }
                 })
                 maxRewardedAd.showAd()
@@ -293,32 +293,32 @@ class AppLovinMaxLoader : AdLoader {
 
             if (maxAppOpenAd.isReady && AppLovinSdk.getInstance(activity).isInitialized) {
                 maxAppOpenAd.setListener(object : MaxAdListener {
-                    override fun onAdLoaded(ad: MaxAd?) {
+                    override fun onAdLoaded(ad: MaxAd) {
 
                     }
 
-                    override fun onAdDisplayed(ad: MaxAd?) {
+                    override fun onAdDisplayed(ad: MaxAd) {
                         adListener.onAdShow(adResult.adBean)
                         AdManager.instance.globalListener?.invoke(adResult.adBean)
                     }
 
-                    override fun onAdHidden(ad: MaxAd?) {
+                    override fun onAdHidden(ad: MaxAd) {
                         adLogWithFrame(msg = "穿山甲广告-开屏-关闭")
                         adListener.onAdClose()
                         destroyAd(adResult)
                     }
 
-                    override fun onAdClicked(ad: MaxAd?) {
+                    override fun onAdClicked(ad: MaxAd) {
                         adLogWithFrame(msg = "AppLovinMax广告-开屏-点击")
                         adListener.onAdClick()
                     }
 
-                    override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
+                    override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
                         adLogWithFrame(msg = "AppLovinMax广告-开屏-点击")
 
                     }
 
-                    override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                    override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                         adLogWithFrame(msg = "AppLovinMax广告-开屏-显示失败")
                         adListener.onAdShowFail("AppLovinMax广告-开屏-显示失败")
                     }

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/request/AppLovinMaxAppOpenRequestImpl.kt

@@ -34,27 +34,27 @@ class AppLovinMaxAppOpenRequestImpl : IAdFormatRequest {
 
             val appOpenAd = MaxAppOpenAd(adUnitBean.adUnitId, context)
             appOpenAd.setListener(object : MaxAdListener {
-                override fun onAdLoaded(ad: MaxAd?) {
+                override fun onAdLoaded(ad: MaxAd) {
                     printAdInfo(adUnitBean)
                     it.isActiveResult(AdResult.Success(appOpenAd, adUnitBean, msg = "AppLovinMax广告-开屏-加载成功"))
                 }
 
-                override fun onAdDisplayed(ad: MaxAd?) {
+                override fun onAdDisplayed(ad: MaxAd) {
                 }
 
-                override fun onAdHidden(ad: MaxAd?) {
+                override fun onAdHidden(ad: MaxAd) {
                 }
 
-                override fun onAdClicked(ad: MaxAd?) {
+                override fun onAdClicked(ad: MaxAd) {
 
                 }
 
-                override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
-                    printAdFailInfo(adUnitBean, error?.code ?: 0, error?.message)
+                override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
+                    printAdFailInfo(adUnitBean, error.code ?: 0, error.message)
                     it.isActiveResult(AdResult.Fail(adUnitBean, msg = "AppLovinMax广告-开屏-加载失败"))
                 }
 
-                override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
 
                 }
             })

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/request/AppLovinMaxBannerRequestImpl.kt

@@ -41,7 +41,7 @@ class AppLovinMaxBannerRequestImpl : IAdFormatRequest {
             maxAdView.setExtraParameter("allow_pause_auto_refresh_immediately", "true")
             maxAdView.stopAutoRefresh()
             val listener = object : MaxAdViewAdListener {
-                override fun onAdLoaded(ad: MaxAd?) {
+                override fun onAdLoaded(ad: MaxAd) {
                     printAdInfo(adUnitBean)
                     //更新view的高度
                     val width = ViewGroup.LayoutParams.MATCH_PARENT
@@ -58,21 +58,21 @@ class AppLovinMaxBannerRequestImpl : IAdFormatRequest {
                     it.isActiveResult(AdResult.Success(adObject = maxAdView, adUnitBean, msg = "AppLovinMax广告-横幅-加载成功"))
                 }
 
-                override fun onAdDisplayed(ad: MaxAd?) {
+                override fun onAdDisplayed(ad: MaxAd) {
 //                    adLog(TAG, "广告展示")
                 }
 
-                override fun onAdHidden(ad: MaxAd?) {
+                override fun onAdHidden(ad: MaxAd) {
 
                 }
 
-                override fun onAdClicked(ad: MaxAd?) {
+                override fun onAdClicked(ad: MaxAd) {
                     //这里没有错，横幅广告点击才算广告打开
 
                 }
 
-                override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
-                    printAdFailInfo(adUnitBean, error?.code ?: 0, error?.message)
+                override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
+                    printAdFailInfo(adUnitBean, error.code, error.message)
 
                     error?.waterfall?.let {
                         for (networkRespons in it.networkResponses) {
@@ -83,13 +83,13 @@ class AppLovinMaxBannerRequestImpl : IAdFormatRequest {
                     it.isActiveResult(AdResult.Fail(adUnitBean, msg = "AppLovinMax广告-横幅-加载失败"))
                 }
 
-                override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                 }
 
-                override fun onAdExpanded(ad: MaxAd?) {
+                override fun onAdExpanded(ad: MaxAd) {
                 }
 
-                override fun onAdCollapsed(ad: MaxAd?) {
+                override fun onAdCollapsed(ad: MaxAd) {
 
                 }
             }

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/request/AppLovinMaxInterstitialRequestImpl.kt

@@ -35,27 +35,27 @@ class AppLovinMaxInterstitialRequestImpl : IAdFormatRequest {
 
             val interstitialAd = MaxInterstitialAd(adUnitBean.adUnitId, context)
             interstitialAd.setListener(object : MaxAdListener{
-                override fun onAdLoaded(ad: MaxAd?) {
+                override fun onAdLoaded(ad: MaxAd) {
                     printAdInfo(adUnitBean)
                     it.isActiveResult(AdResult.Success(adObject = interstitialAd, adBean = adUnitBean, msg = "AppLovinMax广告-插屏-加载成功"))
                 }
 
-                override fun onAdDisplayed(ad: MaxAd?) {
+                override fun onAdDisplayed(ad: MaxAd) {
 
                 }
 
-                override fun onAdHidden(ad: MaxAd?) {
+                override fun onAdHidden(ad: MaxAd) {
                 }
 
-                override fun onAdClicked(ad: MaxAd?) {
+                override fun onAdClicked(ad: MaxAd) {
                 }
 
-                override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
+                override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
                     printAdFailInfo(adUnitBean, error?.code?:0, error?.message)
                     it.isActiveResult(AdResult.Fail(adUnitBean, msg = "AppLovinMax广告-插屏-加载失败"))
                 }
 
-                override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                 }
             })
             interstitialAd.loadAd()

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/request/AppLovinMaxNativeRequestImpl.kt

@@ -39,24 +39,24 @@ class AppLovinMaxNativeRequestImpl() : IAdFormatRequest {
             val maxNativeAdLoader = MaxNativeAdLoader(adUnitBean.adUnitId, context)
 
             val listener = object : MaxNativeAdListener() {
-                override fun onNativeAdLoaded(maxNativeAdView: MaxNativeAdView?, p1: MaxAd?) {
+                override fun onNativeAdLoaded(maxNativeAdView: MaxNativeAdView?, p1: MaxAd) {
                     super.onNativeAdLoaded(maxNativeAdView, p1)
                     printAdInfo(adUnitBean)
                     //这里会保存下三个值， 用于处理destroy
-                    it.isActiveResult(AdResult.Success(adBean = adUnitBean, adObject = Triple<MaxNativeAdLoader, MaxNativeAdView?, MaxAd?>(maxNativeAdLoader, maxNativeAdView, p1), msg = "AppLovinMax广告-原生模板-加载成功"))
+                    it.isActiveResult(AdResult.Success(adBean = adUnitBean, adObject = Triple<MaxNativeAdLoader, MaxNativeAdView?, MaxAd>(maxNativeAdLoader, maxNativeAdView, p1), msg = "AppLovinMax广告-原生模板-加载成功"))
                 }
 
-                override fun onNativeAdClicked(p0: MaxAd?) {
+                override fun onNativeAdClicked(p0: MaxAd) {
                     super.onNativeAdClicked(p0)
                 }
 
-                override fun onNativeAdLoadFailed(p0: String?, p1: MaxError?) {
+                override fun onNativeAdLoadFailed(p0: String, p1: MaxError) {
                     super.onNativeAdLoadFailed(p0, p1)
                     printAdFailInfo(adUnitBean, p1?.code?:0, p1?.message)
                     it.isActiveResult(AdResult.Fail(adUnitBean, msg = "AppLovinMax广告-原生模板-加载失败"))
                 }
 
-                override fun onNativeAdExpired(p0: MaxAd?) {
+                override fun onNativeAdExpired(p0: MaxAd) {
                     super.onNativeAdExpired(p0)
                 }
             }

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/request/AppLovinMaxNativeTemplateRequestImpl.kt

@@ -36,24 +36,24 @@ class AppLovinMaxNativeTemplateRequestImpl : IAdFormatRequest {
             val maxNativeAdLoader = MaxNativeAdLoader(adUnitBean.adUnitId, context)
 
             val listener = object : MaxNativeAdListener() {
-                override fun onNativeAdLoaded(maxNativeAdView: MaxNativeAdView?, p1: MaxAd?) {
+                override fun onNativeAdLoaded(maxNativeAdView: MaxNativeAdView?, p1: MaxAd) {
                     super.onNativeAdLoaded(maxNativeAdView, p1)
                     printAdInfo(adUnitBean)
                     //这里会保存下三个值， 用于处理destroy
-                    it.isActiveResult(AdResult.Success(adBean = adUnitBean, adObject = Triple<MaxNativeAdLoader, MaxNativeAdView?, MaxAd?>(maxNativeAdLoader, maxNativeAdView, p1), msg = "AppLovinMax广告-原生模板-加载成功"))
+                    it.isActiveResult(AdResult.Success(adBean = adUnitBean, adObject = Triple(maxNativeAdLoader, maxNativeAdView, p1), msg = "AppLovinMax广告-原生模板-加载成功"))
                 }
 
-                override fun onNativeAdClicked(p0: MaxAd?) {
+                override fun onNativeAdClicked(p0: MaxAd) {
                     super.onNativeAdClicked(p0)
                 }
 
-                override fun onNativeAdLoadFailed(p0: String?, p1: MaxError?) {
+                override fun onNativeAdLoadFailed(p0: String, p1: MaxError) {
                     super.onNativeAdLoadFailed(p0, p1)
                     printAdFailInfo(adUnitBean, p1?.code?:0, p1?.message)
                     it.isActiveResult(AdResult.Fail(adUnitBean, msg = "AppLovinMax广告-原生模板-加载失败"))
                 }
 
-                override fun onNativeAdExpired(p0: MaxAd?) {
+                override fun onNativeAdExpired(p0: MaxAd) {
                     super.onNativeAdExpired(p0)
                 }
             }

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/request/AppLovinMaxRewardRequestImpl.kt

@@ -37,36 +37,36 @@ class AppLovinMaxRewardRequestImpl : IAdFormatRequest {
             val maxRewardedAd = MaxRewardedAd.getInstance(adUnitBean.adUnitId, context)
 
             maxRewardedAd.setListener(object : MaxRewardedAdListener{
-                override fun onAdLoaded(ad: MaxAd?) {
+                override fun onAdLoaded(ad: MaxAd) {
                     printAdInfo(adUnitBean)
                     it.isActiveResult(AdResult.Success(adObject = maxRewardedAd, adBean = adUnitBean, msg = "AppLovinMax广告-激励-加载成功"))
                 }
 
-                override fun onAdDisplayed(ad: MaxAd?) {
+                override fun onAdDisplayed(ad: MaxAd) {
 
                 }
 
-                override fun onAdHidden(ad: MaxAd?) {
+                override fun onAdHidden(ad: MaxAd) {
                 }
 
-                override fun onAdClicked(ad: MaxAd?) {
+                override fun onAdClicked(ad: MaxAd) {
                 }
 
-                override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
+                override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
                     printAdFailInfo(adUnitBean, error?.code?:0, error?.message)
                     it.isActiveResult(AdResult.Fail(adUnitBean, msg = "AppLovinMax广告-激励-加载失败"))
                 }
 
-                override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                 }
 
-                override fun onUserRewarded(ad: MaxAd?, reward: MaxReward?) {
+                override fun onUserRewarded(ad: MaxAd, reward: MaxReward) {
                 }
 
-                override fun onRewardedVideoStarted(ad: MaxAd?) {
+                override fun onRewardedVideoStarted(ad: MaxAd) {
                 }
 
-                override fun onRewardedVideoCompleted(ad: MaxAd?) {
+                override fun onRewardedVideoCompleted(ad: MaxAd) {
                 }
             })
             maxRewardedAd.loadAd()

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/view/AppLovinMaxBannerView.kt

@@ -58,36 +58,36 @@ class AppLovinMaxBannerView(context: Context?) : BasicAdView<MaxAdView>(context)
         fun populateBannerAdView(context: Context, adResult: AdResult.Success?, viewHolder: BannerAdViewHolder?) {
             val maxAdView = adResult?.adObject as? MaxAdView
             maxAdView?.setListener(object : MaxAdViewAdListener {
-                override fun onAdLoaded(ad: MaxAd?) {
+                override fun onAdLoaded(ad: MaxAd) {
                     adLogWithFrame(msg = "AppLovinMax广告-横幅-onAdLoaded")
                 }
 
-                override fun onAdDisplayed(ad: MaxAd?) {
+                override fun onAdDisplayed(ad: MaxAd) {
                     adResult?.adBean?.let { viewHolder?.adListener?.onAdShow(it) }
                 }
 
-                override fun onAdHidden(ad: MaxAd?) {
+                override fun onAdHidden(ad: MaxAd) {
                     viewHolder?.adListener?.onAdClose()
                 }
 
-                override fun onAdClicked(ad: MaxAd?) {
+                override fun onAdClicked(ad: MaxAd) {
                     viewHolder?.adListener?.onAdClick()
                 }
 
-                override fun onAdLoadFailed(adUnitId: String?, error: MaxError?) {
+                override fun onAdLoadFailed(adUnitId: String, error: MaxError) {
 
                 }
 
-                override fun onAdDisplayFailed(ad: MaxAd?, error: MaxError?) {
+                override fun onAdDisplayFailed(ad: MaxAd, error: MaxError) {
                     adLogWithFrame(AdManager.TAG, "AppLovinMax广告-横幅-显示失败\ncode:${error?.code}\nmessage:${error?.message}")
                     viewHolder?.adListener?.onAdShowFail("AppLovinMax广告-横幅-显示失败")
                 }
 
-                override fun onAdExpanded(ad: MaxAd?) {
+                override fun onAdExpanded(ad: MaxAd) {
 
                 }
 
-                override fun onAdCollapsed(ad: MaxAd?) {
+                override fun onAdCollapsed(ad: MaxAd) {
                 }
 
             })

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/view/AppLovinMaxNativeTemplateView.kt

@@ -66,7 +66,7 @@ class AppLovinMaxNativeTemplateView(context: Context?) : BasicAdView<MaxNativeAd
             val triple = adResult.adObject as? Triple<MaxNativeAdLoader, MaxNativeAdView?, MaxAd?>
 
             triple?.first?.setNativeAdListener(object : MaxNativeAdListener() {
-                override fun onNativeAdClicked(p0: MaxAd?) {
+                override fun onNativeAdClicked(p0: MaxAd) {
                     super.onNativeAdClicked(p0)
                     viewHolder.adListener?.onAdClick()
                     adLogWithFrame(msg = "AppLovinMax广告-原生模板-点击")

lib_ad_applovinmax/src/main/java/com/composition/android/ad/applovinmax/load/view/AppLovinMaxNativeView.kt

@@ -87,7 +87,7 @@ class AppLovinMaxNativeView(context: Context?) : BasicAdView<MaxNativeAdView>(co
             val triple = adResult.adObject as? Triple<MaxNativeAdLoader, MaxNativeAdView?, MaxAd?>
             triple?.first?.render(MaxNativeAdView(binder.build(), context), triple.third)
             triple?.first?.setNativeAdListener(object : MaxNativeAdListener() {
-                override fun onNativeAdClicked(p0: MaxAd?) {
+                override fun onNativeAdClicked(p0: MaxAd) {
                     super.onNativeAdClicked(p0)
                     viewHolder.adListener?.onAdClick()
                     adLogWithFrame(msg = "AppLovinMax广告-原生-点击")

lib_ad_core/src/main/java/com/composition/android/lib/ad/util/AdCoreExtenstions.kt

@@ -33,7 +33,7 @@ fun View.getActivityFromView() : Activity?{
     var cont = context
     while (cont is ContextWrapper){
         if (cont is Activity){
-            return cont as Activity
+            return cont
         }
         cont = cont.baseContext
     }

lib_ad_gromore/build.gradle

@@ -62,6 +62,6 @@ dependencies {
     api project(':lib_ad_core')
 
     /*GroMore*/
-    api 'com.pangle.cn:mediation-sdk:5.6.0.8'
+    api 'com.pangle.cn:mediation-sdk:5.8.0.7'
 
 }

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/impl/GroMoreInitialize.kt

@@ -28,34 +28,44 @@ class GroMoreInitialize(var appId: String) : Initialize {
 
         userInfo.customInfos = customInfos
 
-        val mediationExtra = mapOf(AdnLocalExtraConfig.EXTRA_AGREE_AGREEMENT to true,
+        val mediationExtra = mapOf(
+            AdnLocalExtraConfig.EXTRA_AGREE_AGREEMENT to true,
             AdnLocalExtraConfig.EXTRA_UNION_ADN_CHANNEL_ID to 8,
-            AdnLocalExtraConfig.EXTRA_IS_LIMIT_PERSONAL_AD to true)
+            AdnLocalExtraConfig.EXTRA_IS_LIMIT_PERSONAL_AD to true
+        )
 
-        TTAdSdk.init(context, TTAdConfig.Builder()
-            .appId(appId)
-            .useTextureView(true)
-            .appName(context.packageName)
-            .supportMultiProcess(true)
-            .debug(AdManager.instance.isDebug)
-            .useMediation(true)
-            .customController(object : TTCustomController() {
+        val result = TTAdSdk.init(
+            context, TTAdConfig.Builder()
+                .appId(appId)
+                .useTextureView(true)
+                .appName(context.packageName)
+                .supportMultiProcess(true)
+                .debug(AdManager.instance.isDebug)
+                .useMediation(true)
+                .customController(object : TTCustomController() {
 
-            })
-            .setMediationConfig(MediationConfig.Builder()
-                .setLocalExtra(mediationExtra)
-                .build())
-            .build(), object : TTAdSdk.InitCallback{
+                })
+                .setMediationConfig(
+                    MediationConfig.Builder()
+                        .setLocalExtra(mediationExtra)
+                        .build()
+                )
+                .build()
+        )
 
+        TTAdSdk.start(object : TTAdSdk.Callback {
             override fun success() {
-                TTAdSdk.isInitSuccess()
                 adLogE(AdManager.TAG, "GroMoreSDK初始化完成 ---- 版本号:${TTAdSdk.getAdManager().sdkVersion}")
+
             }
 
             override fun fail(p0: Int, p1: String?) {
                 adLogE(AdManager.TAG, "GroMoreSDK初始化失败")
+
             }
+
         })
+
     }
 
     override fun getAdLoader(): AdLoader {

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/load/GroMoreAdLoader.kt

@@ -11,7 +11,6 @@ import com.bytedance.sdk.openadsdk.TTFullScreenVideoAd
 import com.bytedance.sdk.openadsdk.TTNativeAd
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
 import com.bytedance.sdk.openadsdk.TTRewardVideoAd
-import com.bytedance.sdk.openadsdk.TTSplashAd
 import com.bytedance.sdk.openadsdk.mediation.manager.MediationAdEcpmInfo
 import com.composition.android.ad.gromore.load.request.*
 import com.composition.android.ad.gromore.load.view.GmNativeAdView
@@ -123,9 +122,11 @@ class GroMoreAdLoader : AdLoader {
                     val ttNativeExpressAd = adResult.adObject as TTNativeExpressAd
                     advertisersContainerView.removeAllViews()
                     val expressAdView = ttNativeExpressAd.expressAdView
-                    expressAdView.parentRemove()
-                    advertisersContainerView.addView(expressAdView)
-                    GMNativeTemplateAdView.populateNativeTemplateAdView(context, adResult, viewHolder)
+                    if (expressAdView != null) {
+                        expressAdView.parentRemove()
+                        advertisersContainerView.addView(expressAdView)
+                        GMNativeTemplateAdView.populateNativeTemplateAdView(context, adResult, viewHolder)
+                    }
                 }
             }
 
@@ -146,7 +147,7 @@ class GroMoreAdLoader : AdLoader {
                 override fun onAdShow() {
                     adListener.onAdShow(adResult.adBean)
                     AdManager.instance.globalListener?.invoke(adResult.adBean)
-                    adLogWithFrame(msgs = mutableListOf<String>("GroMore-插屏-展示").apply {
+                    adLogWithFrame(msgs = mutableListOf("GroMore-插屏-展示").apply {
                         addAll(adResult.adBean.logInfo())
                         ttFullScreenVideoAd.mediationManager?.showEcpm?.let {
                             addAll(it.getMediationManagerInfo())
@@ -190,7 +191,7 @@ class GroMoreAdLoader : AdLoader {
                 override fun onAdShow() {
                     adListener.onAdShow(adResult.adBean)
                     AdManager.instance.globalListener?.invoke(adResult.adBean)
-                    adLogWithFrame(msgs = mutableListOf<String>("GroMore-激励视频-展示").apply {
+                    adLogWithFrame(msgs = mutableListOf("GroMore-激励视频-展示").apply {
                         addAll(adResult.adBean.logInfo())
                         ttRewardVideoAd.mediationManager?.showEcpm?.let {
                             addAll(it.getMediationManagerInfo())
@@ -218,13 +219,14 @@ class GroMoreAdLoader : AdLoader {
                     adLogWithFrame(msg = "GroMore-激励视频-视频异常")
                 }
 
+                @Deprecated(message = "")
                 override fun onRewardVerify(p0: Boolean, p1: Int, p2: String?, p3: Int, p4: String?) {
-                    adLogWithFrame(msg = "GroMore-激励视频-获取奖励")
-                    adListener.onAdRewarded()
+
                 }
 
                 override fun onRewardArrived(p0: Boolean, p1: Int, p2: Bundle?) {
-
+                    adLogWithFrame(msg = "GroMore-激励视频-获取奖励")
+                    adListener.onAdRewarded()
                 }
 
                 override fun onSkippedVideo() {
@@ -254,7 +256,7 @@ class GroMoreAdLoader : AdLoader {
                     adListener.onAdShow(adResult.adBean)
                     AdManager.instance.globalListener?.invoke(adResult.adBean)
                     adLogWithFrame(
-                        msgs = mutableListOf<String>("GroMore-开屏-展示").apply {
+                        msgs = mutableListOf("GroMore-开屏-展示").apply {
                             addAll(adResult.adBean.logInfo())
                             ttSplashAd.mediationManager?.showEcpm?.let {
                                 addAll(it.getMediationManagerInfo())

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/load/request/GMAppOpenRequestImpl.kt

@@ -32,8 +32,8 @@ class GMAppOpenRequestImpl : IAdFormatRequest {
 
                 TTAdSdk.getAdManager().createAdNative(context)
                     .loadSplashAd(adSlot, object : TTAdNative.CSJSplashAdListener{
-                        override fun onSplashLoadSuccess() {
 
+                        override fun onSplashLoadSuccess(p0: CSJSplashAd?) {
                         }
 
                         override fun onSplashLoadFail(p0: CSJAdError) {

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/load/request/GMInterstitialRequestImpl.kt

@@ -43,7 +43,9 @@ class GMInterstitialRequestImpl : IAdFormatRequest {
                     override fun onFullScreenVideoAdLoad(p0: TTFullScreenVideoAd?) {
                     }
 
+                    @Deprecated(message = "")
                     override fun onFullScreenVideoCached() {
+
                     }
 
                     override fun onFullScreenVideoCached(p0: TTFullScreenVideoAd?) {

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/load/request/GMRewardRequestImpl.kt

@@ -42,6 +42,7 @@ class GMRewardRequestImpl : IAdFormatRequest {
                     override fun onRewardVideoAdLoad(p0: TTRewardVideoAd?) {
                     }
 
+                    @Deprecated(message = "")
                     override fun onRewardVideoCached() {
 
                     }

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/load/view/GMTTFeedAdView.kt

@@ -83,7 +83,7 @@ class GMTTFeedAdView(context: Context?) : BasicAdView<View>(context) {
                 })
             }
             if (ttFeedAd.mediationManager.isExpress) {
-                ttFeedAd.setExpressRenderListener { view, fl, fl2, b ->
+                ttFeedAd.setExpressRenderListener { view, _, _, _ ->
                     advertisersContainerView?.removeAllViews()
                     view?.parentRemove()
                     advertisersContainerView?.addView(ttFeedAd.adView)
@@ -174,7 +174,7 @@ class GMTTFeedAdView(context: Context?) : BasicAdView<View>(context) {
 
                     })
 
-                ttFeedAd.setExpressRenderListener { view, width, height, isExpress ->
+                ttFeedAd.setExpressRenderListener { _, width, height, _ ->
                     adLog(AdManager.TAG, "穿山甲广告-原生-渲染成功 width:${width},height:${height}")
                     viewHolder.adListener?.onAdShow(adResult.adBean)
                 }

lib_ad_gromore/src/main/java/com/composition/android/ad/gromore/load/view/GmNativeAdView.kt

@@ -170,7 +170,7 @@ class GmNativeAdView(context: Context?) : BasicAdView<View>(context) {
 
                 })
 
-            ttNativeAd.setExpressRenderListener { view, width, height, isExpress ->
+            ttNativeAd.setExpressRenderListener { _, width, height, _ ->
                 adLog(AdManager.TAG, "穿山甲广告-原生-渲染成功 width:${width},height:${height}")
                 viewHolder.adListener?.onAdShow(adResult.adBean)
 //                (viewHolder.customLayoutRootView as? ViewGroup)?.let {

lib_ad_gromore_adn/build.gradle

@@ -42,5 +42,6 @@ android {
 dependencies {
     compileOnly fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     api project(':lib_ad_gromore')
-    compileOnly 'com.qq.e.union:union:4.540.1410'
+    // https://developers.adnet.qq.com/doc/android/union/union_version
+    compileOnly 'com.qq.e.union:union:4.551.1421'
 }

lib_common/src/main/java/com/convenient/android/common/base/view/BaseDialogFragment.kt

@@ -29,7 +29,7 @@ open class BaseDialogFragment : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        dialog?.setOnKeyListener { dialog, keyCode, event ->
+        dialog?.setOnKeyListener { _, keyCode, event ->
             if ((keyCode == KeyEvent.KEYCODE_BACK) or (keyCode == KeyEvent.KEYCODE_ESCAPE) and mCanKeyBack){
                 dismiss()
                 return@setOnKeyListener true