修改空文件夹

app/src/main/java/com/base/datarecovery/activity/junkclean/CleanJunkActivity.kt

@@ -17,7 +17,6 @@ import com.base.datarecovery.bean.ChildBean
 import com.base.datarecovery.bean.ConstObject.JUNK_CLEANER
 import com.base.datarecovery.databinding.ActivityLayoutCleanJunkBinding
 import com.base.datarecovery.help.BaseActivity
-import com.base.datarecovery.help.FileHelp
 import com.base.datarecovery.help.KotlinExt.toFormatSize
 import com.base.datarecovery.help.PermissionHelp.checkStorePermission
 import com.base.datarecovery.help.PermissionHelp.requestStorePermission
@@ -193,24 +192,32 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
 
         val list = arrayListOf<ChildBean>()
         async {
-            val emptyFolder1 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM))
-            val emptyFolder2 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
-            val emptyFolder3 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS))
-            val emptyFolder4 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES))
-            val emptyFolder5 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES))
-            val emptyFolder6 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC))
-            val emptyFolder = arrayListOf<File>()
-            emptyFolder.addAll(emptyFolder1)
-            emptyFolder.addAll(emptyFolder2)
-            emptyFolder.addAll(emptyFolder3)
-            emptyFolder.addAll(emptyFolder4)
-            emptyFolder.addAll(emptyFolder5)
-            emptyFolder.addAll(emptyFolder6)
-            emptyFolder.filter { it.listFiles().isNullOrEmpty() }.forEach { l ->
-                list.add(ChildBean(R.mipmap.kongwenjian, l.name, l.path, 1))
+            val empty = findEmptyFolders()
+            empty.filter { it.listFiles().isNullOrEmpty() }.forEach { l ->
+                totalSize += l.length()
+                list.add(ChildBean(R.mipmap.kongwenjian, l.name, l.path, l.length()))
             }
             delay(Random.nextLong(1500, 2000))
         }.await()
+//        async {
+//            val emptyFolder1 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM))
+//            val emptyFolder2 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
+//            val emptyFolder3 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS))
+//            val emptyFolder4 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES))
+//            val emptyFolder5 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES))
+//            val emptyFolder6 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC))
+//            val emptyFolder = arrayListOf<File>()
+//            emptyFolder.addAll(emptyFolder1)
+//            emptyFolder.addAll(emptyFolder2)
+//            emptyFolder.addAll(emptyFolder3)
+//            emptyFolder.addAll(emptyFolder4)
+//            emptyFolder.addAll(emptyFolder5)
+//            emptyFolder.addAll(emptyFolder6)
+//            emptyFolder.filter { it.listFiles().isNullOrEmpty() }.forEach { l ->
+//                list.add(ChildBean(R.mipmap.kongwenjian, l.name, l.path, 1))
+//            }
+//            delay(Random.nextLong(1500, 2000))
+//        }.await()
         junkExpandAdapter.addChildData(0, list)
 
 
@@ -281,4 +288,18 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
             it.cancel()
         }
     }
+    fun findEmptyFolders(): List<File> {
+        val externalStorageDir = Environment.getExternalStorageDirectory()
+        val filters = arrayOf("/storage/emulated/0/Android/data", "/storage/emulated/0/Android/obb")
+        val emptyFolders = getAllEmptyFolders(externalStorageDir, filters)
+        return emptyFolders
+    }
+    private fun getAllEmptyFolders(root: File, filters: Array<String>): List<File> {
+        return root.walk()
+            .filter {
+                it.isDirectory && !filters.contains(it.path) && !it.isHidden && it.list()
+                    ?.isEmpty() == true
+            }
+            .toList()
+    }
 }
\ No newline at end of file