Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -10,7 +10,7 @@ android {
     compileSdk 34
 
     defaultConfig {
-        applicationId "com.base.datarecovery"
+        applicationId "com.kk.cleanmaster.file.cleanmaster.master"
         minSdk 24
         targetSdk 34
         versionCode 1

app/google-services.json

@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:286059626470:android:561dad747cfdbdaac0e027",
         "android_client_info": {
-          "package_name": "com.base.datarecovery"
+          "package_name": "com.kk.cleanmaster.file.cleanmaster.master"
         }
       },
       "oauth_client": [],

app/src/main/java/com/base/datarecovery/ads/admob/AdmobBannerColla.kt

@@ -29,7 +29,7 @@ object AdmobBannerUtils {
             val screenPixelDensity = context.resources.displayMetrics.density
             val adWidth = (parent.width / screenPixelDensity).toInt()
             val adSize = AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(context, adWidth)
-            adView?.adUnitId = ConfigHelper.bannerAdmobId
+            adView?.adUnitId = ConfigHelper.bannerMaxId
             adView?.setAdSize(adSize)
             loadCollapsibleBanner()
             parent.viewTreeObserver.removeOnGlobalLayoutListener(listener)

app/src/main/java/com/base/datarecovery/ads/max/AdMaxInit.kt

@@ -27,10 +27,10 @@ object AdMaxInit {
             initConfigBuilder.mediationProvider = AppLovinMediationProvider.MAX
 
             // Enable test mode by default for the current device. Cannot be run on the main thread.
-            val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(this).id
-            if (currentGaid != null) {
-                initConfigBuilder.testDeviceAdvertisingIds = Collections.singletonList(currentGaid)
-            }
+//            val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(this).id
+//            if (currentGaid != null) {
+//                initConfigBuilder.testDeviceAdvertisingIds = Collections.singletonList(currentGaid)
+//            }
 
             // Initialize the AppLovin SDK
             val sdk = AppLovinSdk.getInstance(this)

app/src/main/java/com/base/datarecovery/ads/max/AdMaxInterstitialUtils.kt

@@ -112,7 +112,7 @@ object AdMaxInterstitialUtils {
             val obj2 = JSONObject()
             obj2.put("ad_unit", "interAd")
             EventUtils.event("ad_expire", ext = obj2)
-            interstitialAd?.loadAd()
+            loadInterstitialAd(activity)
             onHidden?.invoke()
             return
         }

app/src/main/java/com/base/datarecovery/help/ConfigHelper.kt

@@ -11,7 +11,7 @@ object ConfigHelper {
     const val eventUrl = "https://rp.rocioxyn.xyz"
     const val apiUrl = "https://api.rocioxyn.xyz"
 
-    const val admobTrueMaxFlase = true
+    const val admobTrueMaxFlase = false
 
     // admob广告id
     const val interAdmobId = "ca-app-pub-3940256099942544/1033173712"
@@ -20,9 +20,10 @@ object ConfigHelper {
     const val bannerAdmobId = "ca-app-pub-3940256099942544/9214589741"
 
     //max广告id
-    const val interAdMaxId = "aa"
-    const val nativeAdMaxId = "bb"
-    const val openAdMaxId = "cc"
+    const val interAdMaxId = "b31e7f6d11ee659e"
+    const val nativeAdMaxId = "96e8fe78b0efc5d1"
+    const val openAdMaxId = "d1d943cdd3127c90"
+    const val bannerMaxId = "ca-app-pub-3940256099942544/9214589741"
 
     //一定展示大图广告
     var mustShowNativeAd: Boolean = false

app/src/main/res/layout/fragment_home.xml

@@ -7,11 +7,6 @@
     android:orientation="vertical"
     tools:context=".fragment.HomeFragment">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">