...

app/src/main/AndroidManifest.xml

@@ -112,11 +112,11 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.CleanGuestActivity"
+            android:name=".activity.scanjunk.CleanGuestActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.PrepareScanActivity"
+            android:name=".activity.scanjunk.PrepareScanActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
@@ -128,7 +128,7 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.CleaningActivity"
+            android:name=".activity.scanjunk.CleaningActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity

app/src/main/java/com/test/easy/easycleanerjunk/activity/CleanGuestActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/CleanGuestActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.content.Intent
 import android.graphics.Color

app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/CleanJunkActivity.kt

@@ -13,7 +13,6 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.test.easy.easycleanerjunk.R
-import com.test.easy.easycleanerjunk.activity.CleaningActivity
 import com.test.easy.easycleanerjunk.activity.ResultActivity
 import com.test.easy.easycleanerjunk.bean.ChildBean
 import com.test.easy.easycleanerjunk.bean.ParentBean
@@ -29,6 +28,9 @@ import com.test.easy.easycleanerjunk.view.AFunOb
 import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
 import pokercc.android.expandablerecyclerview.ExpandableAdapter
 
+/**
+ * 清理数据获取页面
+ */
 class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
     override val isLightMode = false
     private val parentList by lazy {

app/src/main/java/com/test/easy/easycleanerjunk/activity/CleaningActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/CleaningActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.animation.ValueAnimator
 import android.content.Intent
@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.view.animation.LinearInterpolator
 import androidx.core.animation.doOnEnd
 import androidx.core.view.updatePadding
+import com.test.easy.easycleanerjunk.activity.ResultActivity
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutCleanupingBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ConfigHelper
@@ -17,9 +18,11 @@ import com.test.easy.easycleanerjunk.view.AFunOb
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import java.io.File
 import kotlin.random.Random
 
+/**
+ * 实际清理页面
+ */
 class CleaningActivity : BaseActivity<ActivityLayoutCleanupingBinding>() {
     override val isLightMode = true
     override val binding: ActivityLayoutCleanupingBinding by lazy {

app/src/main/java/com/test/easy/easycleanerjunk/activity/PrepareScanActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/PrepareScanActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.content.Intent
 import android.graphics.Color
 import androidx.activity.OnBackPressedCallback
 import androidx.core.view.updatePadding
-import com.test.easy.easycleanerjunk.activity.scanjunk.CleanJunkActivity
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutParepreScanBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils

app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/ScanJunkActivity.kt

@@ -8,6 +8,9 @@ import com.test.easy.easycleanerjunk.databinding.ActivityLayoutScanJunkBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 
+/**
+ * 清理动画页面
+ */
 class ScanJunkActivity : BaseActivity<ActivityLayoutScanJunkBinding>() {
     override val isLightMode = true
     override val binding: ActivityLayoutScanJunkBinding by lazy {

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/SplashJumpUtils.kt

@@ -3,7 +3,7 @@ package com.test.easy.easycleanerjunk.activity.splash
 import android.app.Activity
 import android.content.Intent
 import android.util.Log
-import com.test.easy.easycleanerjunk.activity.CleanGuestActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.CleanGuestActivity
 import com.test.easy.easycleanerjunk.activity.DeviceScanActivity
 import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
 import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity

app/src/main/java/com/test/easy/easycleanerjunk/fragment/HomeFragment.kt

@@ -7,7 +7,6 @@ import android.view.animation.LinearInterpolator
 import android.widget.ScrollView
 import androidx.core.view.updatePadding
 import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
-import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
 import com.test.easy.easycleanerjunk.activity.SettingActivity
 import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
 import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity

app/src/main/java/com/test/easy/easycleanerjunk/service/PermanentNotificationService.kt

@@ -14,9 +14,9 @@ import android.os.IBinder
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
 import com.test.easy.easycleanerjunk.R
-import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerActivity
-import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoActivity
-import com.test.easy.easycleanerjunk.activity.PrepareScanActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.PrepareScanActivity
+import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
+import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
 import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
 import com.test.easy.easycleanerjunk.helps.ConfigHelper
 
@@ -81,13 +81,13 @@ class PermanentNotificationService : Service() {
         expendView.setOnClickPendingIntent(R.id.id_ll_clean, pendingIntent0)
 
 
-        val intent2 = Intent(context, AppManagerActivity::class.java)
+        val intent2 = Intent(context, AppManagerAnimationActivity::class.java)
         val pendingIntent2 =
             PendingIntent.getActivity(context, 0, intent2, PendingIntent.FLAG_IMMUTABLE)
         contentView.setOnClickPendingIntent(R.id.id_app_manager, pendingIntent2)
         expendView.setOnClickPendingIntent(R.id.id_app_manager, pendingIntent2)
 
-        val intent3 = Intent(context, BatteryInfoActivity::class.java)
+        val intent3 = Intent(context, BatteryInfoAnimationActivity::class.java)
         val pendingIntent3 =
             PendingIntent.getActivity(context, 0, intent3, PendingIntent.FLAG_IMMUTABLE)
         contentView.setOnClickPendingIntent(R.id.id_battery_info, pendingIntent3)

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

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context=".activity.appmanager.AppManagerAnimationActivity">
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/fl_lottie"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -20,10 +20,16 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:adjustViewBounds="true"
+            app:layout_constraintBottom_toTopOf="@id/tv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.8"
             app:lottie_autoPlay="true"
             app:lottie_loop="true" />
 
         <TextView
+            android:id="@+id/tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|bottom"
@@ -31,9 +37,12 @@
             android:text="Wait a moment..."
             android:textColor="#333333"
             android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:ignore="HardcodedText" />
 
-    </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
         android:id="@+id/fl_ad"

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

@@ -7,23 +7,25 @@
     android:layout_height="match_parent"
     tools:context=".activity.batteryinfo.BatteryInfoAnimationActivity">
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/id_cons_one"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#0ec897"
-        android:visibility="gone">
+        android:background="#0ec897">
 
         <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
             android:id="@+id/id_battery_lottie"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            app:layout_constraintBottom_toTopOf="@id/tv"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.8"
             app:lottie_autoPlay="true"
             app:lottie_loop="true" />
 
         <TextView
-            android:id="@+id/id_scanning"
+            android:id="@+id/tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
@@ -31,9 +33,12 @@
             android:text="Wait a moment..."
             android:textColor="@color/white"
             android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:ignore="HardcodedText" />
 
-    </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
         android:id="@+id/fl_ad"