修复bug后

app/release/output-metadata.json

-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.eig.fileclean.wh.ag",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 25,
-      "versionName": "3.4",
-      "outputFile": "DumpsterPhotoRecovery-v3.4-release.apk"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -313,10 +313,10 @@
         <!-- Sample AdMob App ID: ca-app-pub-3940256099942544~3347511713 -->
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-4149956191269663~3105959345" />
+            android:value="ca-app-pub-3838048042416287~9437965450" />
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
-            android:value="1138962274559879" />
+            android:value="@string/facebook_app_id" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/base/filerecoveryrecyclebin/ads/admob/AdmobEvent.kt

@@ -171,7 +171,7 @@ object AdmobEvent {
                     val mediationABTestName = extras.getString("mediation_ab_test_name")
                     val mediationABTestVariant = extras.getString("mediation_ab_test_variant")
                     obj.put("adSourceName", adSourceName)
-                    obj.put("ad_unit", "nativeAd")
+
                     obj.put("adSourceId", adSourceId)
                     obj.put("adSourceInstanceName", adSourceInstanceName)
                     obj.put("adSourceInstanceId", adSourceInstanceId)
@@ -193,6 +193,7 @@ object AdmobEvent {
                     val mediationABTestName = extras?.getString("mediation_ab_test_name")
                     val mediationABTestVariant = extras?.getString("mediation_ab_test_variant")
                     obj.put("adSourceName", adSourceName)
+                    obj.put("ad_unit", "nativeAd")
                     obj.put("adSourceId", adSourceId)
                     obj.put("adSourceInstanceName", adSourceInstanceName)
                     obj.put("adSourceInstanceId", adSourceInstanceId)

app/src/main/java/com/base/filerecoveryrecyclebin/fcm/FCMManager.kt

@@ -60,6 +60,7 @@ object FCMManager {
 
                     // Handle new token
                     Log.d("FCM", "FCM Registration Token: $token")
+
                 }
             })
     }

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

@@ -18,16 +18,16 @@ object ConfigHelper {
     const val nativeAdmobIdTest = "ca-app-pub-3940256099942544/2247696110"
 
     // admob广告id
-    const val interAdmobId = "ca-app-pub-4149956191269663/4989886658"
-    const val nativeAdmobId = "ca-app-pub-4149956191269663/7375203384"
-    const val openAdmobId = "ca-app-pub-4149956191269663/2363723315"
-    const val bannerAdmobId = "ca-app-pub-4149956191269663/6781705812"
+    const val interAdmobId = "ca-app-pub-3838048042416287/8234531162"
+    const val nativeAdmobId = "ca-app-pub-3838048042416287/6196724440"
+    const val openAdmobId = "ca-app-pub-3838048042416287/8720350971"
+    const val bannerAdmobId = "ca-app-pub-3838048042416287/6921449490"
 
     //max id
-    const val interAdMaxId = "280ee7e082564c60"
-    const val nativeAdMaxId = "24bf6c0fe4f85473"
-    const val openAdMaxId = "282820c7303da462"
-    const val bannerMaxId = "a7200eb8430dc4aa"
+    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/item_time_media2.xml

@@ -17,10 +17,10 @@
         tools:ignore="UseCompoundDrawables">
 
         <FrameLayout
-            android:layout_marginStart="10dp"
             android:id="@+id/fl_select"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:padding="5dp">
 
             <ImageView

[kuxulei]

修改为测试广告id