===========同步主包代码============

app/src/main/java/com/base/superfilemanager/activity/CleanJunkActivity.kt

@@ -25,6 +25,8 @@ import com.base.superfilemanager.helps.FileHelps
 import com.base.superfilemanager.helps.KotlinExt.toFormatSize
 import com.base.superfilemanager.helps.ads.AdmobUtils
 import com.base.superfilemanager.view.AFunOb
+import com.blankj.utilcode.util.SPUtils
+import com.blankj.utilcode.util.SpanUtils
 import pokercc.android.expandablerecyclerview.ExpandableAdapter
 
 class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
@@ -89,6 +91,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
                     .putExtra("list", selectList.toTypedArray())
                     .putExtra("size", selectSize)
             )
+            var remainSize = sizes.sumOf { it } - selectSize
+            if (remainSize < 0) {
+                remainSize = 0
+            }
+            SPUtils.getInstance().put("remainSize", remainSize)
             finish()
         }
     }

app/src/main/java/com/base/superfilemanager/activity/RecentAppActivity.kt

@@ -35,6 +35,7 @@ import com.base.superfilemanager.helps.ads.AdmobUtils
 import com.base.superfilemanager.helps.recentapp.LaunchTimeStat
 import com.base.superfilemanager.databinding.ActivityRecentAppBinding
 import com.base.superfilemanager.helps.recentapp.ScreenTimeStat
+import com.base.superfilemanager.view.AdPreparationPop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -65,6 +66,9 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
             intData()
             playLottie()
         } else {
+            AdPreparationPop(this@RecentAppActivity) {
+                AdmobUtils.showInterstitialAd(this) {}
+            }.show()
             binding.llContent.visibility = View.GONE
             binding.flPermission.visibility = View.VISIBLE
         }
@@ -94,6 +98,9 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
                 if (checkUsageAccessSettings()) {
                     binding.flPermission.visibility = View.GONE
                     binding.llContent.visibility = View.VISIBLE
+                    AdPreparationPop(this@RecentAppActivity) {
+                        AdmobUtils.showInterstitialAd(this) {}
+                    }
                     intData()
                 } else {
                     finishToMain()

app/src/main/java/com/base/superfilemanager/activity/ResultActivity.kt

@@ -43,10 +43,6 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
                     startActivity(Intent(this, ScanJunkActivity::class.java))
                 }
 
-//                VIRUS_SCAN -> {
-//                    startActivity(Intent(this, VirusActivity::class.java))
-//                }
-
                 RECENT_APP_USAGE -> {
                     startActivity(Intent(this, RecentAppActivity::class.java))
                 }
@@ -56,21 +52,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
                 }
 
                 NOTIFICATION_CLEANER -> {
-                    if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
-                        startActivity(
-                            Intent(
-                                this,
-                                NotificationCleanActivity::class.java
-                            )
-                        )
-                    } else {
-                        startActivity(
-                            Intent(
-                                this,
-                                NotificationGuestActivity::class.java
-                            )
-                        )
-                    }
+                    startActivity(Intent(this, NotificationGuestActivity::class.java))
                 }
 
                 NETWORK_TRAFFIC -> {

app/src/main/java/com/base/superfilemanager/activity/splash/SplashJumpUtils.kt

@@ -29,7 +29,6 @@ import com.base.superfilemanager.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
 import com.base.superfilemanager.bean.ConfigBean.Companion.ID_UNINSTALL_PACKAGE_PUSH
 import com.base.superfilemanager.helps.ConfigHelper
 import com.base.superfilemanager.helps.EventHelper
-import com.base.superfilemanager.notificationclean.NotificationCleanActivity
 import com.base.superfilemanager.notificationclean.NotificationGuestActivity
 
 object SplashJumpUtils {
@@ -73,11 +72,7 @@ object SplashJumpUtils {
             }
 
             ID_CLEAN_NOTIFICATION -> {
-                if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
-                    context.startActivity(Intent(context, NotificationCleanActivity::class.java))
-                } else {
-                    context.startActivity(Intent(context, NotificationGuestActivity::class.java))
-                }
+                context.startActivity(Intent(context, NotificationGuestActivity::class.java))
             }
 
             ID_RECENT_USE_APP -> {

app/src/main/java/com/base/superfilemanager/fragment/HomeFragment.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Environment
 import android.os.StatFs
 import android.util.Log
+import android.view.View
 import android.view.animation.LinearInterpolator
 import android.widget.ScrollView
 import androidx.core.view.updatePadding
@@ -24,6 +25,7 @@ import com.base.superfilemanager.databinding.FragmentLayoutHomeBinding
 import com.base.superfilemanager.helps.BaseFragment
 import com.base.superfilemanager.helps.KotlinExt.setOnClickListener
 import com.base.superfilemanager.helps.KotlinExt.toFormatSize
+import com.base.superfilemanager.helps.LogEx
 import com.base.superfilemanager.helps.NetWorkSpeed
 import com.base.superfilemanager.notificationclean.NotificationCleanActivity
 import com.base.superfilemanager.notificationclean.NotificationGuestActivity
@@ -33,6 +35,7 @@ import kotlinx.coroutines.launch
 
 class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
 
+    private val TAG = "HomeFragment"
     override val binding: FragmentLayoutHomeBinding by lazy {
         FragmentLayoutHomeBinding.inflate(layoutInflater)
     }
@@ -89,11 +92,7 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
             startActivity(Intent(requireContext(), RecentAppActivity::class.java))
         }
         binding.idNotificationCleaner.setOnClickListener {
-            if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
-                startActivity(Intent(requireActivity(), NotificationCleanActivity::class.java))
-            } else {
-                startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java))
-            }
+            startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java))
         }
 
         MainScope().launch(Dispatchers.IO) {
@@ -101,6 +100,30 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        val text = "11.23".substring(0, 4)
+        LogEx.logDebug(TAG, "text=$text")
+
+        val size = SPUtils.getInstance().getLong("remainSize") ?: 0
+        if (size <= 0L) {
+            binding.dianJunckClean.visibility = View.VISIBLE
+            binding.tvRemain.visibility = View.GONE
+        } else {
+            var text = size.toFormatSize()
+            val split = text.split(' ')
+
+            var sss = split[0]
+            if (sss.length > 4) {
+                sss = split[0].substring(0, 4)
+            }
+            text = "$sss ${split[1]}"
+            binding.tvRemain.text = text
+            binding.tvRemain.visibility = View.VISIBLE
+            binding.dianJunckClean.visibility = View.GONE
+        }
+    }
+
     var totalsize = 0L
 
     @SuppressLint("SetTextI18n")

app/src/main/java/com/base/superfilemanager/fragment/ToolsFragment.kt

@@ -51,11 +51,7 @@ class ToolsFragment : BaseFragment<FragmentLayoutToolsBinding>() {
                 }
 
                 NOTIFICATION_CLEANER -> {
-                    if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
-                        startActivity(Intent(requireActivity(), NotificationCleanActivity::class.java))
-                    } else {
-                        startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java))
-                    }
+                    startActivity(Intent(requireActivity(), NotificationGuestActivity::class.java))
                 }
 
                 NETWORK_TRAFFIC -> {

app/src/main/java/com/base/superfilemanager/notificationclean/NotificationGuestActivity.kt

@@ -9,6 +9,7 @@ import com.blankj.utilcode.util.SPUtils
 import com.base.superfilemanager.databinding.ActivityLayoutTionGuestBinding
 import com.base.superfilemanager.helps.BaseActivity
 import com.base.superfilemanager.helps.ads.AdmobUtils
+import kotlin.random.Random
 
 class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>() {
 
@@ -26,6 +27,12 @@ class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>()
         binding.idTzGuest.setAnimation("ying_super_dao/data.json")
         binding.idTzGuest.playAnimation()
         SPUtils.getInstance().put("notification_guest", true)
+        binding.root.postDelayed({
+            AdmobUtils.showInterstitialAd(this) {
+                startActivity(Intent(this, NotificationCleanActivity::class.java))
+                finish()
+            }
+        }, Random.nextLong(2500, 4000))
         binding.idTvTryNow.setOnClickListener {
             startActivity(Intent(this, NotificationCleanActivity::class.java))
             finish()

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

@@ -9,6 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="17dp"
+        android:visibility="gone"
         android:src="@mipmap/guanbi"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -17,6 +18,7 @@
         android:id="@+id/id_tv_ss"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
         android:gravity="center"
         android:text="Close unimportant notifications,\n make notification bar much cleaner"
         android:textColor="#000000"
@@ -51,6 +53,7 @@
         android:layout_marginBottom="40dp"
         android:gravity="center"
         android:text="TRY NOW"
+        android:visibility="gone"
         android:textColor="@color/white"
         android:textSize="18sp"
         app:bl_corners_radius="24dp"

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

@@ -123,50 +123,72 @@
                 android:layout_height="wrap_content">
 
                 <!--垃圾清理-->
-                <com.noober.background.view.BLLinearLayout
-                    android:id="@+id/id_clean_junk"
+                <FrameLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    app:bl_corners_radius="10dp"
-                    tools:ignore="RtlSymmetry">
+                    android:layout_weight="1">
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="16dp"
-                        android:layout_marginBottom="8dp">
+                    <com.noober.background.view.BLLinearLayout
+                        android:id="@+id/id_clean_junk"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        app:bl_corners_radius="10dp"
+                        tools:ignore="RtlSymmetry">
 
-                        <androidx.appcompat.widget.AppCompatImageView
+                        <androidx.appcompat.widget.LinearLayoutCompat
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
-                            android:src="@drawable/cleanjunk_home"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <com.noober.background.view.BLTextView
-                            android:id="@+id/dian_junk"
-                            android:layout_width="6dp"
-                            android:layout_height="6dp"
-                            app:bl_shape="oval"
-                            app:bl_solid_color="#EB423B" />
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <TextView
+                            android:layout_marginTop="16dp"
+                            android:layout_marginBottom="8dp">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:src="@drawable/cleanjunk_home"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <com.noober.background.view.BLTextView
+                                android:id="@+id/dian_junck_clean"
+                                android:layout_width="6dp"
+                                android:layout_height="6dp"
+                                app:bl_shape="oval"
+                                app:bl_solid_color="#EB423B" />
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginBottom="20dp"
+                            android:ellipsize="end"
+                            android:singleLine="true"
+                            android:text="Clean Junk"
+                            android:textColor="#000000"
+                            android:textSize="13sp"
+                            tools:ignore="HardcodedText" />
+                    </com.noober.background.view.BLLinearLayout>
+
+                    <com.noober.background.view.BLTextView
+                        android:id="@+id/tv_remain"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="20dp"
-                        android:ellipsize="end"
-                        android:singleLine="true"
-                        android:text="Clean Junk"
-                        android:textColor="#000000"
-                        android:textSize="13sp"
-                        tools:ignore="HardcodedText" />
-                </com.noober.background.view.BLLinearLayout>
+                        android:layout_gravity="end"
+                        android:layout_margin="8dp"
+                        android:padding="2dp"
+                        android:textColor="@color/white"
+                        android:textSize="8sp"
+                        android:visibility="gone"
+                        app:bl_corners_radius="2dp"
+                        app:bl_solid_color="#FC1F10"
+                        tools:ignore="SmallSp"
+                        tools:text="12.36MB" />
+                </FrameLayout>
+
 
                 <!--最近使用-->
                 <com.noober.background.view.BLLinearLayout