[拆包]修改清理功能

app/src/main/java/com/base/appzxhy/base/BaseActivity.kt

@@ -466,17 +466,12 @@ enum class LottieEnum(val data: String, val images: String? = null, val isLoop:
 
     BATTERY_INFO_LOTTIE("batteryinfoscan.json"),
     SCREENSHOT_LOTTIE("screenshotsmanagerscan.json"),
-
     UNINSTALL_APP_LOTTIE("appmanagerscan.json"),
-
+    LARGE_FILE_LOTTIE("largefilescan.json"),
+    CLEAN_LOTTIE("quickcleanclean.json"),
 
     SIMILAR_PHOTOS_LOTTIE("similar_photos/scan/data.json", "similar_photos/scan/images"),
-
-
-    CLEAN_LOTTIE("clean.json"),
-    LARGE_FILE_LOTTIE("large_files/scan/data.json", "large_files/scan/images"),
     PHOTO_COMPRESSION_LOTTIE("photo_compression/scan/data.json", "photo_compression/scan/images"),
-    MALWARE_SCAN("malware_scan/scan/data.json", "malware_scan/scan/images"),
 }
 
 

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

@@ -101,7 +101,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
                 holder.binding.tvName.text = group.name
                 holder.binding.tvLength.text = Utils.getSizeFormat(group.length)
                 holder.binding.ivIcon.setImageResource(group.icon)
-                holder.binding.ivIndicator.setImageResource(if (expand) R.drawable.icon_up else R.drawable.icon_down)
+                holder.binding.ivIndicator.setImageResource(if (expand) R.drawable.icon_zhankai_clean else R.drawable.icon_shouqi_clean)
                 holder.binding.clItem.setBackgroundResource(if (expand && group.items.isNotEmpty()) R.drawable.white_background_top_8 else R.drawable.white_background_8)
                 holder.binding.ivSelect.isSelected = group.isSelected
                 holder.binding.ivSelect.setOnClickListener {
@@ -115,11 +115,17 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
                 }
 
                 if (isStartAnimation) {
-                    val translationX = holder.itemView.context.resources.displayMetrics.widthPixels.toFloat()
-                    holder.itemView.translationX = -translationX
-                    MyAnimationUtils.translationX(holder.itemView, -translationX, 0f, 1000, (groupPosition + 1) * 300L)
+                    holder.binding.ivRotate.visibility = View.VISIBLE
+                    holder.binding.ivSelect.visibility = View.INVISIBLE
+                    MyAnimationUtils.rotation(holder.binding.ivRotate)
+//                    val translationX = holder.itemView.context.resources.displayMetrics.widthPixels.toFloat()
+//                    holder.itemView.translationX = -translationX
+//                    MyAnimationUtils.translationX(holder.itemView, -translationX, 0f, 1000, (groupPosition + 1) * 300L)
+                } else {
+                    holder.binding.ivRotate.visibility = View.GONE
+                    holder.binding.ivSelect.visibility = View.VISIBLE
                 }
-                if (groupPosition == list.size - 1) isStartAnimation = false
+//                if (groupPosition == list.size - 1) isStartAnimation = false
             }
 
             override fun onBindChildViewHolder(
@@ -175,6 +181,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
         }
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     override fun initView() {
         super.initView()
         binding.expandableFiles.adapter = adapter
@@ -311,6 +318,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
             delay(random)
             launch(Dispatchers.Main) {
                 scanComplete()
+                isStartAnimation = false
                 adapter.notifyDataSetChanged()
             }
         }

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

@@ -115,6 +115,7 @@
 
     <include
         android:id="@+id/layout_animation"
-        layout="@layout/layout_animation"
+        layout="@layout/layout_animation_2"
         android:visibility="gone" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -273,7 +273,8 @@
 
     <include
         android:id="@+id/layout_animation"
-        layout="@layout/layout_animation"
-        android:visibility="gone" />
+        layout="@layout/layout_animation_2"
+        android:visibility="visible"
+        tools:visibility="invisible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -9,6 +9,7 @@
         android:id="@+id/cl_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_16"
         android:layout_marginTop="12dp"
         android:background="@drawable/white_background_8"
         android:paddingHorizontal="16dp"
@@ -42,7 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:src="@drawable/icon_down"
+            android:src="@drawable/icon_shouqi_clean"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/tv_name"
             app:layout_constraintTop_toTopOf="parent" />
@@ -56,18 +57,32 @@
             android:textColor="@color/color_aeb4bd"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/iv_select"
+            app:layout_constraintEnd_toStartOf="@id/fl"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="HardcodedText" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/iv_select"
+        <FrameLayout
+            android:id="@+id/fl"
             android:layout_width="@dimen/dp_20"
             android:layout_height="@dimen/dp_20"
             android:src="@drawable/bg_select_fang"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/ivSelect"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/ivRotate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/icon_saomiao" />
+
+        </FrameLayout>
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>