同步代码

app/src/main/java/com/base/easyfilemanager/activity/FileCategoryActivity.kt

@@ -72,6 +72,8 @@ class FileCategoryActivity : BaseActivity<ActivityFileCategoryBinding>() {
                 }
             }
         }.show()
+
+        AdmobUtils.showNativeAd(this, binding.flAd)
     }
 
     private fun initStatusBar() {

app/src/main/java/com/base/easyfilemanager/activity/FileManagerActivity.kt

@@ -54,6 +54,8 @@ class FileManagerActivity : BaseActivity<ActivityFileManagerBinding>() {
         AdPreparationPop(this) {
             AdmobUtils.showInterstitialAd(this) {}
         }.show()
+
+        AdmobUtils.showNativeAd(null, binding.flAd)
     }
 
     private fun initStatusBar() {

app/src/main/java/com/base/easyfilemanager/activity/ScreenShotActivity.kt

@@ -43,6 +43,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
         binding.rv.adapter = screenShotAdapter
 
         playLottie()
+        AdmobUtils.showNativeAd(this, binding.flAd)
     }
 
     private fun playLottie() {
@@ -59,12 +60,13 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
                 if (checkStorePermission()) {
                     initData()
                 } else {
-                    dialog = showGerPermission(null, deny = {},
-                        allow = {
-                            requestStorePermission(launcher, result = { flag ->
-                                if (flag) initData() else finishToMain()
-                            })
+                    dialog = showGerPermission(null, deny = {
+                        onBackPressedDispatcher.onBackPressed()
+                    }, allow = {
+                        requestStorePermission(launcher, result = { flag ->
+                            if (flag) initData() else finishToMain()
                         })
+                    })
                 }
             }
 

app/src/main/java/com/base/easyfilemanager/adapter/ScreenShotAdapter.kt

@@ -93,9 +93,9 @@ class ScreenShotAdapter(
     fun setData(screenshotBean: List<ScreenshotBean>) {
         beans.clear()
         beans.addAll(screenshotBean)
-        if (beans.isNotEmpty()) {
-            beans.add(1, ScreenshotBean().apply { isAd = true })
-        }
+//        if (beans.isNotEmpty()) {
+//            beans.add(1, ScreenshotBean().apply { isAd = true })
+//        }
         notifyDataSetChanged()
     }
 

app/src/main/java/com/base/easyfilemanager/display/NotificationHelper.kt

@@ -175,7 +175,9 @@ object NotificationHelper {
             }
 
             ID_BATTERY_PUSH -> {
-
+                remoteViews.setImageViewResource(R.id.iv_icon, R.mipmap.h_battery)
+                remoteViews.setTextViewText(R.id.tv_desc, "View phone battery consumption recently")
+                remoteViews.setTextViewText(R.id.tv_btn, "View")
             }
 //==================================下面是被动推送的情况===============================================
             else -> {

app/src/main/java/com/base/easyfilemanager/notificationclean/NotificationCleanActivity.kt

@@ -71,11 +71,11 @@ class NotificationCleanActivity : BaseActivity<ActivityLayoutTionCleanBinding>()
             startService(serviceIntent)
             binding.idNeedNotifcationPremison.isVisible = false
             playAnimal()
+            AdmobUtils.showNativeAd(this, binding.flAd)
         } else {
             binding.idNeedNotifcationPremison.isVisible = true
+            AdmobUtils.showNativeAd(this, binding.flAdPermission)
         }
-
-        AdmobUtils.showNativeAd(this, binding.flAd)
     }
 
     override fun initListener() {

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

@@ -35,8 +35,8 @@
                 android:layout_gravity="center_vertical"
                 android:src="@mipmap/fanhui_w"
                 app:layout_constraintStart_toStartOf="parent"
-                tools:ignore="ContentDescription"
-                app:tint="@color/black" />
+                app:tint="@color/black"
+                tools:ignore="ContentDescription" />
 
         </FrameLayout>
 
@@ -78,6 +78,10 @@
                     android:layout_weight="1"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
+                <FrameLayout
+                    android:id="@+id/fl_ad"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <com.noober.background.view.BLTextView
                     android:id="@+id/tv_delete"

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

@@ -28,8 +28,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:src="@mipmap/fanhui_tint"
-                tools:ignore="ContentDescription"
-                app:tint="@color/black" />
+                app:tint="@color/black"
+                tools:ignore="ContentDescription" />
 
         </FrameLayout>
 
@@ -134,6 +134,11 @@
 
         </FrameLayout>
 
+        <FrameLayout
+            android:id="@+id/fl_ad"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
         <LinearLayout
             android:id="@+id/ll_operation"
             android:layout_width="match_parent"

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

@@ -89,7 +89,6 @@
         android:textColor="@color/white"
         android:textSize="18sp"
         android:textStyle="bold"
-
         app:bl_corners_radius="24dp"
         app:bl_solid_color="@color/theme_color"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -205,5 +204,18 @@
             app:bl_solid_color="@color/theme_color"
             tools:ignore="HardcodedText" />
 
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp">
+
+            <FrameLayout
+                android:id="@+id/fl_ad_permission"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom" />
+        </FrameLayout>
+
+
     </androidx.appcompat.widget.LinearLayoutCompat>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -45,7 +45,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/fl_ad"
         app:layout_constraintTop_toBottomOf="@id/fl_top">
 
         <com.google.android.material.tabs.TabLayout
@@ -64,10 +64,6 @@
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <FrameLayout
-            android:id="@+id/fl_ad"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
     </LinearLayout>
 
     <FrameLayout
@@ -127,7 +123,6 @@
         android:background="@color/white"
         android:gravity="center"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.airbnb.lottie.LottieAnimationView
@@ -158,5 +153,10 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <FrameLayout
+        android:id="@+id/fl_ad"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -64,8 +64,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.3">
-            </FrameLayout>
+                app:layout_constraintVertical_bias="0.3"></FrameLayout>
 
             <LinearLayout
                 android:id="@+id/ll_size"
@@ -123,6 +122,11 @@
             android:layout_weight="1"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
+        <FrameLayout
+            android:id="@+id/fl_ad"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="80dp">
@@ -174,6 +178,7 @@
                 tools:ignore="HardcodedText" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
+
     </LinearLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout