From c717e497a829a065b2f8408ec79d88c8cc930da0 Mon Sep 17 00:00:00 2001
From: jackjintai <jackjintai@didiglobal.com>
Date: Thu, 6 Aug 2020 21:17:02 +0800
Subject: [PATCH] =?UTF-8?q?android:=E6=9B=B4=E6=96=B0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filemanager/action/file/FileListAction.kt | 71 +++++++++++++------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/filemanager/action/file/FileListAction.kt b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/filemanager/action/file/FileListAction.kt
index 0eca8b54..bd250083 100644
--- a/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/filemanager/action/file/FileListAction.kt
+++ b/Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/filemanager/action/file/FileListAction.kt
@@ -37,7 +37,8 @@ object FileListAction {
                 val fileInfos = traverseDir(dirPath)
                 if (dirPath == FileManagerUtil.externalStorageRootPath && fileInfos.isEmpty()) {
                     this["code"] = 0
-                    this["message"] = DokitUtil.getString(DoKitR.string.dk_file_manager_sd_permission_tip)
+                    this["message"] =
+                        DokitUtil.getString(DoKitR.string.dk_file_manager_sd_permission_tip)
                     ToastUtils.showShort(DokitUtil.getString(DoKitR.string.dk_file_manager_sd_permission_tip))
                 }
                 this["fileList"] = fileInfos
@@ -56,8 +57,28 @@ object FileListAction {
         val fileInfos = mutableListOf<FileInfo>()
         val internalAppDataPath = PathUtils.getInternalAppDataPath()
         val externalStoragePath = PathUtils.getExternalStoragePath()
-        fileInfos.add(FileInfo(FileManagerUtil.ROOT_PATH_STR, FileUtils.getFileName(internalAppDataPath), "", "folder", "", "" + FileUtils.getFileLastModified(internalAppDataPath), true))
-        fileInfos.add(FileInfo(FileManagerUtil.ROOT_PATH_STR, "external", "", "folder", "", "" + FileUtils.getFileLastModified(externalStoragePath), true))
+        fileInfos.add(
+            FileInfo(
+                FileManagerUtil.ROOT_PATH_STR,
+                FileUtils.getFileName(internalAppDataPath),
+                "",
+                "folder",
+                "",
+                "" + FileUtils.getFileLastModified(internalAppDataPath),
+                true
+            )
+        )
+        fileInfos.add(
+            FileInfo(
+                FileManagerUtil.ROOT_PATH_STR,
+                "external",
+                "",
+                "folder",
+                "",
+                "" + FileUtils.getFileLastModified(externalStoragePath),
+                true
+            )
+        )
         return fileInfos
     }
 
@@ -69,19 +90,25 @@ object FileListAction {
         val dir = File(dirPath)
         if (FileUtils.isFileExists(dir) && FileUtils.isDir(dir)) {
             dir.listFiles()?.forEach { file ->
-                val fileInfo = FileInfo(FileManagerUtil.relativeRootPath(dirPath), file.name,
-                        if (FileUtils.isDir(file)) {
-                            ""
-                        } else {
-                            ConvertUtils.byte2FitMemorySize(file.length(), 1)
-                        },
-                        if (FileUtils.isDir(file)) {
-                            "folder"
-                        } else if (dir.absolutePath.contains("/databases")) {
-                            "db"
-                        } else {
+                val fileInfo = FileInfo(
+                    FileManagerUtil.relativeRootPath(dirPath), file.name,
+                    if (FileUtils.isDir(file)) {
+                        ""
+                    } else {
+                        ConvertUtils.byte2FitMemorySize(file.length(), 1)
+                    },
+                    if (FileUtils.isDir(file)) {
+                        "folder"
+                    } else if (dir.absolutePath.contains("/databases")) {
+                        "db"
+                    } else {
+                        if (FileUtils.getFileExtension(file).isNotBlank()) {
                             FileUtils.getFileExtension(file)
-                        }, "", "" + FileUtils.getFileLastModified(file), false)
+                        } else {
+                            "txt"
+                        }
+                    }, "", "" + FileUtils.getFileLastModified(file), false
+                )
                 fileInfos.add(fileInfo)
             }
 
@@ -92,13 +119,13 @@ object FileListAction {
 
 
     data class FileInfo(
-            val dirPath: String,
-            val fileName: String,
-            val fileSize: String,
-            val fileType: String,
-            val fileUri: String,
-            val modifyTime: String,
-            val isRootPath: Boolean
+        val dirPath: String,
+        val fileName: String,
+        val fileSize: String,
+        val fileType: String,
+        val fileUri: String,
+        val modifyTime: String,
+        val isRootPath: Boolean
     )
 }
 
-- 
GitLab