[拆包]修复问题

app/src/main/java/com/base/appzxhy/ui/clean/CleanPageFragment.kt

@@ -12,6 +12,7 @@ import com.base.appzxhy.R
 class CleanPageFragment : Fragment() {
 
     var tvPath: TextView? = null
+    var tvSize: TextView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -30,6 +31,7 @@ class CleanPageFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         tvPath = view.findViewById<TextView>(R.id.tvPath)
+        tvSize = view.findViewById<TextView>(R.id.tvSize)
 
     }
 

app/src/main/java/com/base/appzxhy/ui/clean/JunkCleanActivity.kt

@@ -22,11 +22,13 @@ import com.base.appzxhy.base.cleanFileBeans
 import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN
 import com.base.appzxhy.bean.FeatureBean.Companion.setFunctionTodayUsed
 import com.base.appzxhy.bean.FileBean
+import com.base.appzxhy.bean.config.AdConfigBean
 import com.base.appzxhy.databinding.ActivityJunkClean2Binding
 import com.base.appzxhy.databinding.ItemJunkCleanChildBinding
 import com.base.appzxhy.databinding.ItemJunkCleanGroupBinding
 import com.base.appzxhy.ui.cleanresult.CleanResultActivity
 import com.base.appzxhy.utils.FileUtils
+import com.base.appzxhy.utils.KotlinExt.toFormatSize
 import com.base.appzxhy.utils.MediaUtils
 import com.base.appzxhy.utils.MineTypeUtils
 import com.base.appzxhy.utils.MyAnimationUtils
@@ -53,11 +55,20 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
 
     private val page1 by lazy { CleanPageFragment() }
     private val page2 by lazy { CleanNativeFragment() }
+    private val fragments by lazy {
+        arrayListOf<Fragment>().apply {
+            add(page1)
+            if (AdConfigBean.adsConfigBean.isAdShow) {
+                binding.indicator.visibility = View.VISIBLE
+                add(page2)
+            }
+        }
+    }
     private val viewPagerAdapter by lazy {
         object : FragmentStateAdapter(this) {
-            override fun getItemCount(): Int = 2
+            override fun getItemCount(): Int = fragments.size
 
-            override fun createFragment(position: Int): Fragment = if (position == 0) page1 else page2
+            override fun createFragment(position: Int): Fragment = fragments[position]
         }
     }
     private var currentPosition = 0
@@ -218,20 +229,21 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
             }
         })
 
-        lifecycleScope.launch(Dispatchers.IO) {
-            while (isActive) {
-                delay(3000)
-                launch(Dispatchers.Main) {
-                    if (currentPosition == 0) {
-                        binding.viewPager2.setCurrentItem(1, true)
-                    } else {
-                        binding.viewPager2.setCurrentItem(0, true)
+        if (AdConfigBean.adsConfigBean.isAdShow){
+            lifecycleScope.launch(Dispatchers.IO) {
+                while (isActive) {
+                    delay(3000)
+                    launch(Dispatchers.Main) {
+                        if (currentPosition == 0) {
+                            binding.viewPager2.setCurrentItem(1, true)
+                        } else {
+                            binding.viewPager2.setCurrentItem(0, true)
+                        }
                     }
                 }
             }
         }
 
-
     }
 
     override fun initListener() {
@@ -345,6 +357,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
         binding.tvClean.visibility = View.VISIBLE
         updateSelection()
         page1.tvPath?.setText(R.string.scan_completed)
+        page1.tvSize?.text = getString(R.string.found_f, total.toFormatSize())
     }
 
     private fun setSize(size: Long) {

app/src/main/java/com/base/appzxhy/ui/splash/SplashActivity.kt

@@ -86,7 +86,9 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
         super.initView()
         showLoadingAd()
         setPrivacyPolicy()
-        requestNotificationPermission()
+        if (!isGuided) {
+            requestNotificationPermission()
+        }
         viewModel.jumpNext = {
             Log.e(TAG, "Countdown jumpNext")
             jumpNext()

app/src/main/res/drawable/bg_00e4fd_0066ff.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:endColor="#0066FF"
+        android:startColor="#00E4FD" />
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="@color/white" />
+    <corners android:radius="@dimen/dp_88" />
+</shape>
\ No newline at end of file

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

@@ -61,6 +61,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
+            android:paddingBottom="@dimen/dp_20"
             android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -99,7 +100,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_60"
+                    android:layout_marginTop="@dimen/dp_40"
                     android:orientation="horizontal"
                     android:paddingHorizontal="38dp"
                     app:layout_constraintTop_toBottomOf="@id/iv_battery">

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

@@ -56,6 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_4"
+            android:visibility="invisible"
             android:layout_marginBottom="@dimen/dp_38"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,19 +9,19 @@
     android:paddingHorizontal="@dimen/dp_26"
     tools:context=".ui.clean.CleanNativeFragment">
 
-    <FrameLayout
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@drawable/bg_ffffff_8">
+        android:layout_marginHorizontal="@dimen/dp_16"
+        app:cardBackgroundColor="@color/white"
+        app:cardCornerRadius="@dimen/dp_8">
 
         <com.base.appzxhy.business.ads.NativeParentView
             android:id="@+id/flAd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="@dimen/dp_16"
-            android:layout_marginHorizontal="@dimen/dp_8">
+            android:layout_gravity="center">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
@@ -30,7 +31,7 @@
 
         </com.base.appzxhy.business.ads.NativeParentView>
 
-    </FrameLayout>
+    </androidx.cardview.widget.CardView>
 
 
 </FrameLayout>
\ No newline at end of file

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

@@ -14,10 +14,29 @@
         android:orientation="vertical"
         tools:ignore="UselessParent">
 
-        <androidx.appcompat.widget.AppCompatImageView
+        <FrameLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/img_shuju" />
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/img_shuju" />
+
+            <TextView
+                android:id="@+id/tvSize"
+                android:layout_width="@dimen/dp_238"
+                android:layout_height="@dimen/dp_50"
+                android:layout_gravity="center"
+                android:layout_marginTop="@dimen/dp_20"
+                android:background="@drawable/bg_00e4fd_0066ff"
+                android:gravity="center"
+                android:text="@string/redundant_files_found"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16"
+                android:textStyle="bold" />
+        </FrameLayout>
+
 
         <TextView
             android:id="@+id/tvPath"
@@ -28,10 +47,10 @@
             android:gravity="center"
             android:paddingHorizontal="@dimen/dp_8"
             android:singleLine="true"
-            android:text="@string/scan_completed"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_16"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:text="@string/scan_completed" />
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file

app/src/main/res/values/dimens.xml

@@ -66,4 +66,5 @@
     <dimen name="dp_72">72dp</dimen>
     <dimen name="dp_132">132dp</dimen>
     <dimen name="dp_200">200dp</dimen>
+    <dimen name="dp_238">238dp</dimen>
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -170,6 +170,8 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="scan_completed">Scan Completed</string>
     <string name="turn_on_notification">Turn on notification</string>
+    <string name="redundant_files_found">Redundant Files Found</string>
+    <string name="found_f">%1$s Found</string>
 
 
 </resources>