Commit 8cfabf3a authored by wanglei's avatar wanglei

[拆包]清理功能呢修改

parent 487741ae
...@@ -246,7 +246,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl ...@@ -246,7 +246,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
cleanFileBeans(selectedFiles) cleanFileBeans(selectedFiles)
CleanResultActivity.functionKey = JUNK_CLEAN CleanResultActivity.functionKey = JUNK_CLEAN
CleanResultActivity.titleName = this@JunkCleanActivity.getString(R.string.junk_clean) CleanResultActivity.titleName = this@JunkCleanActivity.getString(R.string.quick_clean)
CleanResultActivity.total = total CleanResultActivity.total = total
goToAc(CleanResultActivity::class.java) goToAc(CleanResultActivity::class.java)
finish() finish()
...@@ -264,6 +264,12 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl ...@@ -264,6 +264,12 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
page1.tvPath?.text = "" page1.tvPath?.text = ""
binding.tvClean.visibility = View.GONE binding.tvClean.visibility = View.GONE
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
list = getGroupData()
launch(Dispatchers.Main) {
adapter.notifyDataSetChanged()
}
val emptyFolders = async { FileUtils.findEmptyFolders() }.await() val emptyFolders = async { FileUtils.findEmptyFolders() }.await()
val files = async { MediaUtils.findSpecifiedFiles(this@JunkCleanActivity) }.await() val files = async { MediaUtils.findSpecifiedFiles(this@JunkCleanActivity) }.await()
emptyFolders.forEach { it.isSelected = true } emptyFolders.forEach { it.isSelected = true }
...@@ -279,7 +285,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl ...@@ -279,7 +285,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkClean2Binding>(ActivityJunkCl
MineTypeUtils.logs.any { suffix -> file.name.endsWith(suffix, true) } MineTypeUtils.logs.any { suffix -> file.name.endsWith(suffix, true) }
}.toMutableList() }.toMutableList()
list = getGroupData()
list[0].length = emptyFolders.sumOf { it.length } list[0].length = emptyFolders.sumOf { it.length }
list[1].length = apkFiles.sumOf { it.length } list[1].length = apkFiles.sumOf { it.length }
list[2].length = tempFiles.sumOf { it.length } list[2].length = tempFiles.sumOf { it.length }
......
...@@ -124,7 +124,7 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle ...@@ -124,7 +124,7 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
private fun getData(): MutableList<FeatureBean> { private fun getData(): MutableList<FeatureBean> {
val list = mutableListOf<FeatureBean>().apply { val list = mutableListOf<FeatureBean>().apply {
add(FeatureBean(JUNK_CLEAN, R.string.junk_clean, R.drawable.icon_clean_r, R.string.clean_now)) add(FeatureBean(JUNK_CLEAN, R.string.quick_clean, R.drawable.icon_clean_r, R.string.clean_now))
add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.icon_battery_info_r, R.string.view)) add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.icon_battery_info_r, R.string.view))
add( add(
FeatureBean( FeatureBean(
......
...@@ -41,7 +41,7 @@ class HomeFragment : BaseFragment<FragmentHome2Binding>(FragmentHome2Binding::in ...@@ -41,7 +41,7 @@ class HomeFragment : BaseFragment<FragmentHome2Binding>(FragmentHome2Binding::in
listOf<FeatureBean>( listOf<FeatureBean>(
FeatureBean( FeatureBean(
JUNK_CLEAN, JUNK_CLEAN,
R.string.clean_junk, R.string.quick_clean,
R.drawable.icon_clean_h, R.drawable.icon_clean_h,
).apply { ).apply {
color = R.color.color_fffaf7 color = R.color.color_fffaf7
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:text="@string/junk_clean" android:text="@string/quick_clean"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" android:textStyle="bold"
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_16"
android:background="@color/white" android:background="@color/white"
android:paddingHorizontal="16dp" android:paddingHorizontal="@dimen/dp_16"
android:paddingVertical="12dp"> android:paddingVertical="12dp">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
android:id="@+id/fl" android:id="@+id/fl"
android:layout_width="@dimen/dp_20" android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:src="@drawable/bg_select_fang"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
...@@ -73,7 +72,8 @@ ...@@ -73,7 +72,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivSelect" android:id="@+id/ivSelect"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:src="@drawable/bg_select_fang" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivRotate" android:id="@+id/ivRotate"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment