Support go back while in custom root mode. (#158)

rosuH · web-flow · commit 07d3b5bf9686 · 2021-12-12T16:26:32.000+08:00
* 📝 [Update] - README.md * 📝 [Update] - Support Android 10. - README.md * 🐛 [Fix] - Data list not clean. #157 * ✨ [Update] - Supported go back while in custom root mode. #41
diff --git a/filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt b/filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt
@@ -14,6 +14,7 @@ import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.AnimationUtils
@@ -35,7 +36,8 @@ import java.io.File
 import java.util.concurrent.*
 
 @SuppressLint("ShowToast")
-class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerViewListener.OnItemClickListener{
+class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
+    RecyclerViewListener.OnItemClickListener {
 
     private var rvList: RecyclerViewFilePicker? = null
     private var rvNav: RecyclerView? = null
@@ -71,7 +73,26 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
 
     private val loadFileRunnable: Runnable by lazy {
         Runnable {
+            val customRootPathFile = pickerConfig.customRootPathFile
             val rootFile = when {
+                customRootPathFile?.exists() == true -> {
+                    // move to custom root dir
+                    navDataSource.clear()
+                    val root = FileUtils.getRootFile()
+                    var curPath = customRootPathFile.absolutePath
+                    while (curPath != root.parent && !curPath.isNullOrBlank()) {
+                        Log.i("loadFileRunnable", "curPath = $curPath")
+                        val f = File(curPath)
+                        val fileNavBeanImpl = FileNavBeanImpl(
+                            FileUtils.getDirAlias(f),
+                            f.absolutePath
+                        )
+                        navDataSource.add(0, fileNavBeanImpl)
+                        curPath = f.parent
+                    }
+                    pickerConfig.resetCustomFile()
+                    customRootPathFile
+                }
                 navDataSource.isEmpty() && pickerConfig.isSkipDir -> {
                     FileUtils.getRootFile()
                 }
@@ -85,6 +106,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
             }
 
             val listData = FileUtils.produceListDataSource(rootFile)
+
             // 导航栏数据集
             navDataSource = FileUtils.produceNavDataSource(
                 navDataSource,
@@ -171,6 +193,8 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
         if (!loadingThreadPool.isShutdown) {
             loadingThreadPool.shutdown()
         }
+        currOffsetMap.clear()
+        currPosMap.clear()
     }
 
     private fun isPermissionGrated() = ContextCompat.checkSelfPermission(
@@ -472,7 +496,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
         position: Int
     ) {
         if (view.id != R.id.item_list_file_picker) return
-        val item = (adapter as FileListAdapter).getItem(position)?: return
+        val item = (adapter as FileListAdapter).getItem(position) ?: return
         // Check the lib users whether if intercept the click event.
         val hookItemClick = FilePickerManager.config.itemClickListener?.onItemLongClick(
             adapter,
diff --git a/filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerConfig.kt b/filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerConfig.kt
@@ -7,6 +7,7 @@ import me.rosuh.filepicker.FilePickerActivity
 import me.rosuh.filepicker.R
 import me.rosuh.filepicker.engine.ImageEngine
 import me.rosuh.filepicker.filetype.FileType
+import java.io.File
 
 /**
  *
@@ -55,10 +56,12 @@ class FilePickerConfig(private val pickerManager: FilePickerManager) {
     var maxSelectable = Int.MAX_VALUE
         private set
 
+    internal val defaultStorageName = contextRes.getString(R.string.file_picker_tv_sd_card)
+
     /**
      * 存储类型
      */
-    var mediaStorageName = contextRes.getString(R.string.file_picker_tv_sd_card)
+    var mediaStorageName = defaultStorageName
         private set
 
     /**
@@ -75,6 +78,9 @@ class FilePickerConfig(private val pickerManager: FilePickerManager) {
     var customRootPath: String = ""
         private set
 
+    internal var customRootPathFile: File? = null
+        private set
+
     /**
      * 自定义过滤器
      */
@@ -170,6 +176,15 @@ class FilePickerConfig(private val pickerManager: FilePickerManager) {
 
     fun setCustomRootPath(path: String): FilePickerConfig {
         customRootPath = path
+        path.takeIf {
+            it.isNotBlank()
+        }?.let {
+            File(it)
+        }?.takeIf {
+            it.exists()
+        }?.let {
+            customRootPathFile = it
+        }
         return this
     }
 
@@ -311,13 +326,18 @@ class FilePickerConfig(private val pickerManager: FilePickerManager) {
         }
     }
 
+    fun resetCustomFile() {
+        this.customRootPathFile = null
+    }
+
     fun clear() {
         this.customFileTypes.clear()
         this.customImageEngine = null
         this.fileItemOnClickListener = null
         this.selfFilter = null
         this.customDetector = null
         this.defaultFileDetector.clear()
+        resetCustomFile()
     }
 
     companion object {
diff --git a/filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerManager.kt b/filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerManager.kt
@@ -17,9 +17,13 @@ object FilePickerManager {
     const val REQUEST_CODE = 10401
 
     internal var contextRef: WeakReference<Activity>? = null
+
     internal var fragmentRef: WeakReference<Fragment>? = null
+
     internal lateinit var config: FilePickerConfig
 
+    private var dataList: MutableList<String> = ArrayList()
+
     @JvmStatic
     fun from(activity: Activity): FilePickerConfig {
         reset()
@@ -40,12 +44,10 @@ object FilePickerManager {
         return config
     }
 
-    private var dataList: List<String> = ArrayList()
-
     /**
      * 保存数据@param list List<String>到本类中
      */
-    internal fun saveData(list: List<String>) {
+    internal fun saveData(list: MutableList<String>) {
         dataList = list
     }
 
@@ -55,16 +57,18 @@ object FilePickerManager {
      */
     @JvmOverloads
     @JvmStatic
-    fun obtainData(release: Boolean = false): List<String> {
+    fun obtainData(release: Boolean = false): MutableList<String> {
+        val result = ArrayList(dataList)
         if (release) {
             release()
         }
-        return dataList
+        return result
     }
 
     private fun reset() {
         contextRef?.clear()
         fragmentRef?.clear()
+        dataList.clear()
         ImageLoadController.reset()
     }
 
diff --git a/filepicker/src/main/java/me/rosuh/filepicker/utils/FileUtils.kt b/filepicker/src/main/java/me/rosuh/filepicker/utils/FileUtils.kt
@@ -2,7 +2,6 @@ package me.rosuh.filepicker.utils
 
 import android.content.Context
 import android.os.Environment
-import me.rosuh.filepicker.R
 import me.rosuh.filepicker.bean.FileItemBeanImpl
 import me.rosuh.filepicker.bean.FileNavBeanImpl
 import me.rosuh.filepicker.config.FilePickerConfig.Companion.STORAGE_CUSTOM_ROOT_PATH
@@ -25,18 +24,11 @@ class FileUtils {
          * 根据配置参数获取根目录文件
          * @return File
          */
-        fun getRootFile():File {
+        fun getRootFile(): File {
             return when (config.mediaStorageType) {
                 STORAGE_EXTERNAL_STORAGE -> {
                     File(Environment.getExternalStorageDirectory().absoluteFile.toURI())
                 }
-                STORAGE_CUSTOM_ROOT_PATH -> {
-                    if (config.customRootPath.isEmpty()) {
-                        File(Environment.getExternalStorageDirectory().absoluteFile.toURI())
-                    } else {
-                        File(config.customRootPath)
-                    }
-                }
                 else -> {
                     File(Environment.getExternalStorageDirectory().absoluteFile.toURI())
                 }
@@ -70,7 +62,7 @@ class FileUtils {
                 )
                 return config.selfFilter?.doFilter(listData) ?: listData
             }
-            if (rootFile.listFiles().isNullOrEmpty()){
+            if (rootFile.listFiles().isNullOrEmpty()) {
                 return listData
             }
             for (file in rootFile.listFiles()) {
@@ -117,7 +109,11 @@ class FileUtils {
 
             // 默认字典排序
             // Default sort by alphabet
-            listData.sortWith(compareBy({ !it.isDir }, { it.fileName.uppercase(Locale.getDefault()) }))
+            listData.sortWith(
+                compareBy(
+                    { !it.isDir },
+                    { it.fileName.uppercase(Locale.getDefault()) })
+            )
             // 将当前列表数据暴露，以供调用者自己处理数据
             // expose data list  to outside caller
             return config.selfFilter?.doFilter(listData) ?: listData
@@ -132,18 +128,12 @@ class FileUtils {
             nextPath: String,
             context: Context
         ): ArrayList<FileNavBeanImpl> {
-
+            // 优先级：目标设备名称 --> 自定义路径 --> 默认 SD 卡
             if (currentDataSource.isEmpty()) {
-                // 优先级：目标设备名称 --> 自定义路径 --> 默认 SD 卡
+                val dirName = getDirAlias(getRootFile())
                 currentDataSource.add(
                     FileNavBeanImpl(
-                        if (!config.mediaStorageName.isNullOrEmpty()) {
-                            config.mediaStorageName
-                        } else if (!config.customRootPath.isEmpty()) {
-                            config.customRootPath
-                        } else {
-                            context.getString(R.string.file_picker_tv_sd_card)
-                        },
+                        dirName,
                         nextPath
                     )
                 )
@@ -183,5 +173,24 @@ class FileUtils {
             )
             return currentDataSource
         }
+
+        fun getDirAlias(file: File): String {
+            val isCustomRoot = config.mediaStorageType == STORAGE_CUSTOM_ROOT_PATH
+                    && file.absolutePath == config.customRootPath
+            val isPreSetStorageRoot = config.mediaStorageType == STORAGE_EXTERNAL_STORAGE
+                    && file.absolutePath == getRootFile().absolutePath
+            val isDefaultRoot = file.absolutePath == getRootFile().absolutePath
+            return when {
+                isCustomRoot || isPreSetStorageRoot -> {
+                    config.mediaStorageName
+                }
+                isDefaultRoot -> {
+                    config.defaultStorageName
+                }
+                else -> {
+                    file.name
+                }
+            }
+        }
     }
 }
diff --git a/filepicker/src/main/res/layout/main_activity_for_file_picker.xml b/filepicker/src/main/res/layout/main_activity_for_file_picker.xml
@@ -97,7 +97,6 @@
         android:id="@+id/rv_nav_file_picker"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:overScrollMode="never"
         android:elevation="1dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ll_tool_bar_file_picker" />
diff --git a/sample/src/main/java/me/rosuh/sample/SampleActivity.kt b/sample/src/main/java/me/rosuh/sample/SampleActivity.kt
@@ -210,7 +210,7 @@ class SampleActivity : AppCompatActivity() {
         // 自定义根目录
         btn_custom_root_path.setOnClickListener {
             FilePickerManager.from(this@SampleActivity)
-                .storageType("下载", FilePickerConfig.STORAGE_CUSTOM_ROOT_PATH)
+                .storageType("⬇️", FilePickerConfig.STORAGE_CUSTOM_ROOT_PATH)
                 .setTheme(getRandomTheme())
                 // 不指定名称则为导航栏将显示绝对路径
 //                .storageType(FilePickerConfig.STORAGE_CUSTOM_ROOT_PATH)
