From 985a53f86217afe784124267c52ba07b270f2e37 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Wed, 29 Jan 2020 21:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                    |  2 +-
 .../legado/app/ui/importbook/ImportBookActivity.kt  | 13 +++++++++++++
 app/src/main/res/layout/activity_import_book.xml    |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cae1dac53..f5886b609 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -117,7 +117,7 @@ dependencies {
     implementation 'com.google.android:flexbox:1.1.0'
 
     //lifecycle
-    def lifecycle_version = '2.1.0'
+    def lifecycle_version = '2.2.0'
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt
index 42ffb491f..4dcd75776 100644
--- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt
@@ -13,12 +13,14 @@ import io.legado.app.base.VMBaseActivity
 import io.legado.app.help.AppConfig
 import io.legado.app.utils.getViewModel
 import kotlinx.android.synthetic.main.activity_import_book.*
+import java.io.File
 
 
 class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity_import_book) {
     private val requestCodeSelectFolder = 342
     private var rootDoc: DocumentFile? = null
     private val subDirs = arrayListOf<String>()
+    private lateinit var importBookAdapter: ImportBookAdapter
 
     override val viewModel: ImportBookViewModel
         get() = getViewModel(ImportBookViewModel::class.java)
@@ -42,15 +44,26 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
 
     private fun initView() {
         recycler_view.layoutManager = LinearLayoutManager(this)
+        importBookAdapter = ImportBookAdapter(this)
+        recycler_view.adapter = importBookAdapter
     }
 
     private fun upPath() {
         AppConfig.importBookPath?.let {
             val rootUri = Uri.parse(it)
             rootDoc = DocumentFile.fromTreeUri(this, rootUri)
+            subDirs.clear()
+            tv_path.text = getPath()
         }
     }
 
+    private fun getPath(): String {
+        rootDoc?.let {
+            return it.name + File.separator + subDirs.joinToString(File.separator)
+        }
+        return ""
+    }
+
     private fun selectImportFolder() {
         try {
             val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml
index abccf0f01..e3fd0cef3 100644
--- a/app/src/main/res/layout/activity_import_book.xml
+++ b/app/src/main/res/layout/activity_import_book.xml
@@ -21,7 +21,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/file_category_tv_path"
+            android:id="@+id/tv_path"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -33,7 +33,7 @@
             tools:text="/" />
 
         <io.legado.app.lib.theme.view.ATEStrokeTextView
-            android:id="@+id/file_category_tv_back_last"
+            android:id="@+id/tv_go_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"