Merge pull request #102 from rosuH/dev

🐛

Author: rosuH

filepicker/src/main/java/me/rosuh/filepicker/config/DefaultFileDetector.kt

@@ -45,6 +45,11 @@ class DefaultFileDetector : AbstractFileDetector() {
         enableCustomTypes = true
     }
 
+    fun clear(){
+        allDefaultFileType.clear()
+        enableCustomTypes = false
+    }
+
     override fun fillFileType(itemBeanImpl: FileItemBeanImpl): FileItemBeanImpl {
         for (type in allDefaultFileType) {
             if (type.verify(itemBeanImpl.fileName)) {

filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerConfig.kt

@@ -250,6 +250,7 @@ class FilePickerConfig(private val pickerManager: FilePickerManager) {
         this.customImageEngine = ie
         return this
     }
+
     /**
      * @author rosuh@qq.com
      * @date 2020/9/15
@@ -285,6 +286,15 @@ class FilePickerConfig(private val pickerManager: FilePickerManager) {
         }
     }
 
+    fun clear() {
+        this.customFileTypes.clear()
+        this.customImageEngine = null
+        this.fileItemOnClickListener = null
+        this.selfFilter = null
+        this.customDetector = null
+        this.defaultFileDetector.clear()
+    }
+
     companion object {
         /**
          * 手机内部的外置存储，也就是内置 SD 卡

filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerManager.kt

@@ -51,7 +51,11 @@ object FilePickerManager {
      * 供调用者获取结果
      * @return List<String>
      */
-    fun obtainData(): List<String> {
+    @JvmOverloads
+    fun obtainData(release: Boolean = false): List<String> {
+        if (release) {
+            release()
+        }
         return dataList
     }
 
@@ -60,4 +64,15 @@ object FilePickerManager {
         fragmentRef?.clear()
         ImageLoadController.reset()
     }
+
+    /**
+     * 释放资源与重置属性
+     * Release resources and reset attributes
+     */
+    fun release() {
+        reset()
+        if (this::config.isInitialized) {
+            config.clear()
+        }
+    }
 }

sample/src/main/java/me/rosuh/sample/SampleActivity.kt

@@ -9,6 +9,7 @@ import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentManager
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -272,7 +273,7 @@ class SampleActivity : AppCompatActivity() {
         when (requestCode) {
             FilePickerManager.REQUEST_CODE -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    val list = FilePickerManager.obtainData()
+                    val list = FilePickerManager.obtainData(release = true)
                     rv_main.adapter = SampleAdapter(layoutInflater, ArrayList(list))
                     rv_main.layoutManager = LinearLayoutManager(this@SampleActivity)
                     ns_root.scrollTo(0, ScreenUtils.getScreenHeightInPixel(this))