[拆包]ui

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

@@ -34,6 +34,7 @@ import com.base.appzxhy.push.receiver.ScreenStatusReceiver
 import com.base.appzxhy.push.timer.TimerManager.Companion.changeTimer
 import com.base.appzxhy.push.work.RepeatingWorker.Companion.schedulePeriodicWork
 import com.base.appzxhy.ui.batteryinfo.BatteryReceiver.Companion.registerBatteryReceiver
+import com.base.appzxhy.ui.guide.GuideExperienceActivity
 import com.base.appzxhy.ui.splash.SplashActivity
 import com.facebook.appevents.AppEventsLogger
 import kotlinx.coroutines.Dispatchers
@@ -221,7 +222,10 @@ class MyApplication : Application() {
                         noLoadingActivities.all { !topActivity.localClassName.contains(it, true) }
                     }
 
-                    LogEx.logDebug(TAG, "flag=$flag" + "   activity:" + activity.localClassName)
+                    LogEx.logDebug(
+                        TAG,
+                        "flag=$flag" + "   activity:" + activity.localClassName + " topActivity=${topActivity?.localClassName}"
+                    )
 
                     if (flag) {
                         topActivity?.startActivity(

app/src/main/java/com/base/appzxhy/ui/appuninstall/AppUninstallActivity.kt

@@ -21,7 +21,6 @@ class AppUninstallActivity : BaseActivity<ActivityAppUninstallBinding>(ActivityA
 
     private val viewModel: AppUninstallViewModel by viewModels()
 
-
     private val adapter = AppAdapter()
 
     override fun initView() {
@@ -36,6 +35,9 @@ class AppUninstallActivity : BaseActivity<ActivityAppUninstallBinding>(ActivityA
 
     }
 
+    override fun handleBackCallBack() {
+        super.handleBackCallBack()
+    }
     override fun initListener() {
         super.initListener()
 

app/src/main/java/com/base/appzxhy/ui/dialog/FunctionBackDialog.kt

@@ -6,6 +6,7 @@ import androidx.appcompat.app.AlertDialog
 import com.base.appzxhy.R
 import com.base.appzxhy.business.ads.AdsMgr
 import com.base.appzxhy.databinding.DialogFunctionBackBinding
+import com.base.appzxhy.ui.appuninstall.AppUninstallActivity
 import com.base.appzxhy.ui.batteryinfo.BatteryInfoActivity
 import com.base.appzxhy.ui.clean.JunkCleanActivity
 import com.base.appzxhy.ui.largefile.LargeFileCleanActivity
@@ -63,6 +64,11 @@ class FunctionBackDialog(
                 binding.tvContent.text = activity.getString(R.string.exit_similar_photos_content)
             }
 
+            is AppUninstallActivity -> {
+                binding.tvTitle.text = activity.getString(R.string.exit_uninstall_app)
+                binding.tvContent.text = activity.getString(R.string.exit_uninstall_app_content)
+            }
+
             else -> {
                 back.invoke()
                 return

app/src/main/java/com/base/appzxhy/ui/guide/GuideExperienceActivity.kt

 package com.base.appzxhy.ui.guide
 
+import android.util.Log
 import com.base.appzxhy.R
 import com.base.appzxhy.base.BaseActivity
 import com.base.appzxhy.base.jumpAction
@@ -40,6 +41,7 @@ class GuideExperienceActivity : BaseActivity<ActivityGuideExperienceBinding>(
 
             dialog.action = {
                 requestStoragePermission(launcher) {
+                    Log.e(TAG, "requestStoragePermission callback")
                     if (it) {
                         val key = arrayOf(JUNK_CLEAN, SCREENSHOT_CLEAN, LARGE_FILE_CLEAN, PHOTO_COMPRESSION, SIMILAR_PHOTOS).random()
                         jumpAction(key)

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

@@ -12,7 +12,9 @@
         android:id="@+id/flTop"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent">
+        android:background="@color/colorPrimary"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="0dp">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/ivBack"
@@ -21,7 +23,7 @@
             android:layout_marginVertical="@dimen/dp_8"
             android:layout_marginStart="@dimen/dp_8"
             android:padding="@dimen/dp_8"
-            app:srcCompat="@drawable/icon_back" />
+            app:srcCompat="@drawable/icon_back_w" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -29,7 +31,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/dp_60"
             android:text="@string/uninstall_app"
-            android:textColor="#1A1A1A"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_20"
             android:textStyle="bold" />
 

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

@@ -10,6 +10,7 @@
         android:id="@+id/cl_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/colorPrimary"
         app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
@@ -27,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_8"
                 android:padding="@dimen/dp_8"
-                android:src="@drawable/icon_back" />
+                android:src="@drawable/icon_back_w" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
@@ -35,7 +36,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/dp_66"
                 android:text="@string/large_file_clean"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="20sp"
                 android:textStyle="bold" />
 
@@ -191,12 +192,12 @@
             android:src="@drawable/img_queshengye_large" />
 
         <TextView
-            android:textSize="@dimen/sp_14"
-            android:textColor="#AEB4BD"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_18"
-            android:text="@string/content_not_found" />
+            android:text="@string/content_not_found"
+            android:textColor="#AEB4BD"
+            android:textSize="@dimen/sp_14" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -160,6 +160,7 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="exit_screenshot_cleaner">Exit Screenshot Clean</string>
     <string name="exit_screenshot_cleaner_content">Exit Screenshot Clean? Undeleted screenshots might be using space.</string>
     <string name="exit_similar_photos">Exit Duplicate Photos</string>
+    <string name="exit_uninstall_app">Exit Uninstall apps</string>
     <string name="exit_similar_photos_content">Exit Duplicate Photos? Unmoved duplicate photos might be occupying space.</string>
     <string name="logout_content">Are you sure you want to quit without trying to clean up the garbage again？</string>
     <string name="please_wait_a_moment">Please wait a moment</string>
@@ -245,6 +246,7 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="app_function_experience_tip">%s is an advanced cleaner for Android devices to clean mobile phones. Cleaning apps can clean up empty files, log files, outdated APKs, temporary files, similar pictures, and large files. It can also view battery information, uninstall apps and compress pictures.</string>
     <string name="experience_it_immediately">Experience it immediately</string>
     <string name="screenshot">Screenshot</string>
+    <string name="exit_uninstall_app_content">Exit Uninstall App? Unused applications may occupy phone storage</string>
 
 
 </resources>