From d24eef36fe49badb8fe0c982ac107eed76cdb6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Thu, 12 May 2022 18:59:05 +0800
Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=B8=83=E5=B1=80=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/remote/RemoteBookActivity.kt  | 34 +++++++++++++++++++
 .../app/ui/book/remote/RemoteBookViewModel.kt |  7 ++++
 .../main/res/layout/activity_remote_book.xml  | 25 ++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
 create mode 100644 app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
 create mode 100644 app/src/main/res/layout/activity_remote_book.xml

diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
new file mode 100644
index 000000000..acf1e5d71
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -0,0 +1,34 @@
+package io.legado.app.ui.book.remote
+
+import android.os.Bundle
+import androidx.activity.viewModels
+import io.legado.app.base.VMBaseActivity
+
+
+import io.legado.app.databinding.ActivityRemoteBookBinding
+import io.legado.app.utils.toastOnUi
+
+import io.legado.app.utils.viewbindingdelegate.viewBinding
+
+/**
+ * 展示远程书籍
+ * @author qianfanguojin
+ * @time 2022/05/12
+ */
+class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookViewModel>() {
+    override val binding by viewBinding(ActivityRemoteBookBinding::inflate)
+    override val viewModel by viewModels<RemoteBookViewModel>()
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        toastOnUi("远程书籍")
+    }
+
+    private fun initView() {
+//        binding.layTop.setBackgroundColor(backgroundColor)
+//        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+//        binding.recyclerView.adapter = adapter
+//        binding.selectActionBar.setMainActionText(R.string.add_to_shelf)
+//        binding.selectActionBar.inflateMenu(R.menu.import_book_sel)
+//        binding.selectActionBar.setOnMenuItemClickListener(this)
+//        binding.selectActionBar.setCallBack(this)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
new file mode 100644
index 000000000..26088cff5
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
@@ -0,0 +1,7 @@
+package io.legado.app.ui.book.remote
+
+import android.app.Application
+import io.legado.app.base.BaseViewModel
+
+class RemoteBookViewModel(application: Application): BaseViewModel(application){
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_remote_book.xml b/app/src/main/res/layout/activity_remote_book.xml
new file mode 100644
index 000000000..00473e8c1
--- /dev/null
+++ b/app/src/main/res/layout/activity_remote_book.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <io.legado.app.ui.widget.TitleBar
+        android:id="@+id/titleBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:title="远程书籍" />
+
+<!--    <io.legado.app.ui.widget.anima.RefreshProgressBar-->
+<!--        android:id="@+id/refresh_progress_bar"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="2dp"-->
+<!--        app:layout_constraintTop_toBottomOf="@id/lay_top" />-->
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4ecaa4e2bf3d5e0401446205b10b57a4b79e3ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Thu, 12 May 2022 19:52:00 +0800
Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E8=B0=83=E4=BB=B7=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=20Activity=20=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                            | 4 ++++
 .../legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt   | 4 ++++
 app/src/main/res/menu/main_bookshelf.xml                    | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6328e86ea..afe93fb0b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -280,6 +280,10 @@
         <activity
             android:name=".ui.book.local.ImportBookActivity"
             android:launchMode="singleTop" />
+        <!-- 添加远程 -->
+        <activity
+            android:name=".ui.book.remote.RemoteBookActivity"
+            android:launchMode="singleTop" />
         <!-- 发现界面 -->
         <activity
             android:name=".ui.book.explore.ExploreShowActivity"
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 78d16eb92..1d1ca0b51 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -1,6 +1,7 @@
 package io.legado.app.ui.main.bookshelf
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.view.Menu
 import android.view.MenuItem
 import androidx.fragment.app.activityViewModels
@@ -23,6 +24,7 @@ import io.legado.app.ui.book.cache.CacheActivity
 import io.legado.app.ui.book.group.GroupManageDialog
 import io.legado.app.ui.book.local.ImportBookActivity
 import io.legado.app.ui.book.manage.BookshelfManageActivity
+import io.legado.app.ui.book.remote.RemoteBookActivity
 import io.legado.app.ui.book.search.SearchActivity
 import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.ui.main.MainViewModel
@@ -74,6 +76,8 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
     override fun onCompatOptionsItemSelected(item: MenuItem) {
         super.onCompatOptionsItemSelected(item)
         when (item.itemId) {
+            // 查看远程书籍
+            R.id.menu_remote -> startActivity<RemoteBookActivity>()
             R.id.menu_search -> startActivity<SearchActivity>()
             R.id.menu_update_toc -> activityViewModel.upToc(books)
             R.id.menu_bookshelf_layout -> configBookshelf()
diff --git a/app/src/main/res/menu/main_bookshelf.xml b/app/src/main/res/menu/main_bookshelf.xml
index 9713c08eb..0ad539401 100644
--- a/app/src/main/res/menu/main_bookshelf.xml
+++ b/app/src/main/res/menu/main_bookshelf.xml
@@ -10,6 +10,12 @@
         android:title="@string/search"
         app:showAsAction="always" />
 
+    <item
+        android:id="@+id/menu_remote"
+        android:icon="@drawable/ic_add"
+        android:title="远程书籍"
+        app:showAsAction="always" />
+
     <item
         android:id="@+id/menu_update_toc"
         android:icon="@drawable/ic_refresh_black_24dp"

From 20b1fd907727fa12835915cb708b32539c0f72b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Fri, 13 May 2022 22:19:17 +0800
Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/remote/RemoteBookActivity.kt  | 37 +++++++-
 .../app/ui/book/remote/RemoteBookAdapter.kt   | 43 +++++++++
 .../app/ui/book/remote/RemoteBookViewModel.kt | 61 +++++++++++++
 .../main/res/layout/activity_remote_book.xml  | 20 +++-
 app/src/main/res/layout/item_remote_book.xml  | 91 +++++++++++++++++++
 5 files changed, 247 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
 create mode 100644 app/src/main/res/layout/item_remote_book.xml

diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
index acf1e5d71..d6fdc428c 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -1,28 +1,41 @@
 package io.legado.app.ui.book.remote
 
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.viewModels
+import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.data.entities.Book
 
 
 import io.legado.app.databinding.ActivityRemoteBookBinding
+import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.utils.toastOnUi
 
 import io.legado.app.utils.viewbindingdelegate.viewBinding
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.launch
 
 /**
  * 展示远程书籍
  * @author qianfanguojin
  * @time 2022/05/12
  */
-class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookViewModel>() {
+class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookViewModel>(),
+    RemoteBookAdapter.CallBack {
     override val binding by viewBinding(ActivityRemoteBookBinding::inflate)
     override val viewModel by viewModels<RemoteBookViewModel>()
+    private val adapter by lazy { RemoteBookAdapter(this, this) }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
-        toastOnUi("远程书籍")
+        initView()
+        initData()
+//        toastOnUi("远程书籍")
     }
 
     private fun initView() {
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        binding.recyclerView.adapter = adapter
 //        binding.layTop.setBackgroundColor(backgroundColor)
 //        binding.recyclerView.layoutManager = LinearLayoutManager(this)
 //        binding.recyclerView.adapter = adapter
@@ -31,4 +44,24 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 //        binding.selectActionBar.setOnMenuItemClickListener(this)
 //        binding.selectActionBar.setCallBack(this)
     }
+    private fun initData() {
+//        viewModel.getRemoteBooks().observe(this, {
+//            adapter.submitList(it)
+//        })
+
+
+        launch {
+            Log.e("TAG", "2")
+            viewModel.dataFlow.conflate().collect { remoteBooks ->
+                adapter.setItems(remoteBooks)
+            }
+        }
+
+
+//        toastOnUi("1")
+        viewModel.loadRemoteBookList()
+    }
+    override fun showRemoteBookInfo(book: Book) {
+        TODO("Not yet implemented")
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
new file mode 100644
index 000000000..d7f590408
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
@@ -0,0 +1,43 @@
+package io.legado.app.ui.book.remote
+
+import android.content.Context
+import android.view.ViewGroup
+import io.legado.app.base.adapter.ItemViewHolder
+import io.legado.app.base.adapter.RecyclerAdapter
+import io.legado.app.data.entities.Book
+import io.legado.app.databinding.ItemRemoteBookBinding
+
+
+class RemoteBookAdapter (context: Context, val callBack: CallBack) :
+    RecyclerAdapter<String, ItemRemoteBookBinding>(context){
+
+    override fun getViewBinding(parent: ViewGroup): ItemRemoteBookBinding {
+        return ItemRemoteBookBinding.inflate(inflater, parent, false)
+    }
+
+    override fun onCurrentListChanged() {
+
+    }
+
+    /**
+     * 绑定RecycleView 中每一个项的视图和数据
+     */
+    override fun convert(
+        holder: ItemViewHolder,
+        binding: ItemRemoteBookBinding,
+        item: String,
+        payloads: MutableList<Any>
+    ) {
+        binding.run {
+           tvName.text = item
+        }
+    }
+
+    override fun registerListener(holder: ItemViewHolder, binding: ItemRemoteBookBinding) {
+
+    }
+
+    interface CallBack {
+        fun showRemoteBookInfo(book: Book)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
index 26088cff5..5d646b725 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
@@ -1,7 +1,68 @@
 package io.legado.app.ui.book.remote
 
 import android.app.Application
+import android.util.Log
+import android.widget.Toast
 import io.legado.app.base.BaseViewModel
+import io.legado.app.utils.FileDoc
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import java.util.*
+import kotlin.reflect.typeOf
 
 class RemoteBookViewModel(application: Application): BaseViewModel(application){
+
+    private var dataCallback : DataCallback? = null
+    var dataFlowStart: (() -> Unit)? = null
+    val dataFlow = callbackFlow<List<String>> {
+
+        val list = Collections.synchronizedList(ArrayList<String>())
+
+        dataCallback = object : DataCallback {
+
+            override fun setItems(remoteFiles: List<String>) {
+                list.clear()
+                list.addAll(remoteFiles)
+                Log.e("TAG", ": 1", )
+                trySend(list)
+            }
+
+            override fun addItems(remoteFiles: List<String>) {
+                list.addAll(remoteFiles)
+                trySend(list)
+            }
+
+            override fun clear() {
+                list.clear()
+                trySend(emptyList())
+            }
+        }
+
+//        withContext(Dispatchers.Main) {
+//            dataFlowStart?.invoke()
+//        }
+
+        awaitClose {
+            dataCallback = null
+        }
+    }.flowOn(Dispatchers.Main)
+
+    fun loadRemoteBookList() {
+        Log.e("TAG", dataCallback.toString(), )
+        dataCallback?.setItems(listOf("1", "2", "3"))
+    }
+
+    interface DataCallback {
+
+        fun setItems(remoteFiles: List<String>)
+
+        fun addItems(remoteFiles: List<String>)
+
+        fun clear()
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_remote_book.xml b/app/src/main/res/layout/activity_remote_book.xml
index 00473e8c1..55fc04f3c 100644
--- a/app/src/main/res/layout/activity_remote_book.xml
+++ b/app/src/main/res/layout/activity_remote_book.xml
@@ -16,10 +16,24 @@
 <!--        android:layout_width="match_parent"-->
 <!--        android:layout_height="2dp"-->
 <!--        app:layout_constraintTop_toBottomOf="@id/lay_top" />-->
+    <io.legado.app.ui.widget.anima.RefreshProgressBar
+        android:id="@+id/refresh_progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        app:layout_constraintTop_toBottomOf="@id/titleBar" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+    <io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout
+        android:id="@+id/content_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/refresh_progress_bar">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
new file mode 100644
index 000000000..f98be731a
--- /dev/null
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <io.legado.app.ui.widget.image.CoverImageView
+        android:id="@+id/iv_cover"
+        android:layout_width="80dp"
+        android:layout_height="110dp"
+        android:layout_margin="8dp"
+        android:contentDescription="@string/img_cover"
+        android:scaleType="centerCrop"
+        android:src="@drawable/image_cover_default"
+        android:transitionName="img_cover"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="UnusedAttribute" />
+
+    <io.legado.app.ui.widget.text.BadgeView
+        android:id="@+id/bv_originCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:singleLine="true"
+        android:text="@string/app_name"
+        android:textColor="@color/primaryText"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toStartOf="@id/bv_originCount"
+        app:layout_constraintStart_toEndOf="@+id/iv_cover"
+        app:layout_constraintTop_toTopOf="parent" />
+
+<!--    <LinearLayout-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="0dp"-->
+<!--        android:orientation="vertical"-->
+<!--        android:layout_marginTop="3dp"-->
+<!--        app:layout_constraintBottom_toBottomOf="@id/iv_cover"-->
+<!--        app:layout_constraintLeft_toLeftOf="@+id/tv_name"-->
+<!--        app:layout_constraintRight_toRightOf="@id/tv_name"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/tv_name">-->
+
+<!--        <TextView-->
+<!--            android:id="@+id/tv_author"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:ellipsize="end"-->
+<!--            android:lines="1"-->
+<!--            android:text="@string/author"-->
+<!--            android:textColor="@color/primaryText"-->
+<!--            android:textSize="12sp" />-->
+
+<!--        <io.legado.app.ui.widget.LabelsBar-->
+<!--            android:id="@+id/ll_kind"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:orientation="horizontal" />-->
+
+<!--        <TextView-->
+<!--            android:id="@+id/tv_lasted"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:ellipsize="end"-->
+<!--            android:lines="1"-->
+<!--            android:text="@string/last_read"-->
+<!--            android:textColor="@color/primaryText"-->
+<!--            android:textSize="12sp" />-->
+
+<!--        <io.legado.app.ui.widget.text.MultilineTextView-->
+<!--            android:id="@+id/tv_introduce"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            android:ellipsize="end"-->
+<!--            android:text="@string/book_intro"-->
+<!--            android:textColor="@color/primaryText"-->
+<!--            android:textSize="12sp" />-->
+
+<!--    </LinearLayout>-->
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 87732f17935f139721c8dd1d38397327660b75e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Sat, 14 May 2022 23:19:51 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:=201.=20=E4=BF=AE=E5=A4=8DWebDav?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90BUG=202.=20=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=B1=BB=E4=B8=BA=20DateTimeFormatter=20+=20?=
 =?UTF-8?q?LocalDateTime=20=E7=9A=84=E7=BA=BF=E7=A8=8B=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=BB=84=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/lib/webdav/WebDav.kt   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
index d27e731de..04d152845 100644
--- a/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
+++ b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
@@ -19,14 +19,16 @@ import java.io.InputStream
 import java.net.MalformedURLException
 import java.net.URL
 import java.net.URLEncoder
-import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
 
 @Suppress("unused", "MemberVisibilityCanBePrivate")
 open class WebDav(urlStr: String, val authorization: Authorization) {
     companion object {
 
-        @SuppressLint("SimpleDateFormat")
-        private val dateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ZZZ")
+        @SuppressLint("DateTimeFormatter")
+        private val dateTimeFormatter = DateTimeFormatter.RFC_1123_DATE_TIME
 
         // 指定返回哪些属性
         @Language("xml")
@@ -133,11 +135,11 @@ open class WebDav(urlStr: String, val authorization: Authorization) {
                                 .firstOrNull()?.text()?.toLong() ?: 0
                         }.getOrDefault(0)
                         val lastModify: Long = kotlin.runCatching {
-                            element.getElementsByTag("d:getcontentlength")
+                            element.getElementsByTag("d:getlastmodified")
                                 .firstOrNull()?.text()?.let {
-                                    dateFormat.parse(it)
+                                    LocalDateTime.parse(it, dateTimeFormatter).toInstant(ZoneOffset.of("+8")).toEpochMilli()
                                 }
-                        }.getOrNull()?.time ?: 0
+                        }.getOrNull() ?: 0
                         webDavFile = WebDavFile(
                             baseUrl + fileName,
                             authorization,

From 605e6f1110fddfd60f55c8aa349add3e67e801a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Sun, 15 May 2022 01:00:27 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B8=83=E5=B1=80=E8=AE=BE=E8=AE=A1=E5=88=9D=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/activity_remote_book.xml  |   5 +
 app/src/main/res/layout/item_remote_book.xml  | 171 ++++++++++--------
 2 files changed, 97 insertions(+), 79 deletions(-)

diff --git a/app/src/main/res/layout/activity_remote_book.xml b/app/src/main/res/layout/activity_remote_book.xml
index 55fc04f3c..ed942a2cc 100644
--- a/app/src/main/res/layout/activity_remote_book.xml
+++ b/app/src/main/res/layout/activity_remote_book.xml
@@ -36,4 +36,9 @@
 
     </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
 
+    <io.legado.app.ui.widget.SelectActionBar
+        android:id="@+id/select_action_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
index f98be731a..06c2b5488 100644
--- a/app/src/main/res/layout/item_remote_book.xml
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -1,91 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="60dp"
+    android:background="?attr/selectableItemBackground"
+    android:orientation="horizontal"
+    android:baselineAligned="false">
 
-    <io.legado.app.ui.widget.image.CoverImageView
-        android:id="@+id/iv_cover"
-        android:layout_width="80dp"
-        android:layout_height="110dp"
-        android:layout_margin="8dp"
-        android:contentDescription="@string/img_cover"
-        android:scaleType="centerCrop"
-        android:src="@drawable/image_cover_default"
-        android:transitionName="img_cover"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="UnusedAttribute" />
+    <FrameLayout
+        android:layout_width="60dp"
+        android:layout_height="match_parent">
+        <!--选择是否添加文件-->
+        <io.legado.app.lib.theme.view.ThemeCheckBox
+            android:id="@+id/cb_select"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:clickable="false"
+            android:enabled="true"
+            android:focusable="true" />
+        <!--文件夹标识或已选文件标识-->
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="center"
+            android:visibility="invisible"
+            android:src="@drawable/ic_folder"
+            app:tint="@color/primaryText" />
+    </FrameLayout>
 
-    <io.legado.app.ui.widget.text.BadgeView
-        android:id="@+id/bv_originCount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_name"
+    <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:singleLine="true"
-        android:text="@string/app_name"
-        android:textColor="@color/primaryText"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toStartOf="@id/bv_originCount"
-        app:layout_constraintStart_toEndOf="@+id/iv_cover"
-        app:layout_constraintTop_toTopOf="parent" />
-
-<!--    <LinearLayout-->
-<!--        android:layout_width="0dp"-->
-<!--        android:layout_height="0dp"-->
-<!--        android:orientation="vertical"-->
-<!--        android:layout_marginTop="3dp"-->
-<!--        app:layout_constraintBottom_toBottomOf="@id/iv_cover"-->
-<!--        app:layout_constraintLeft_toLeftOf="@+id/tv_name"-->
-<!--        app:layout_constraintRight_toRightOf="@id/tv_name"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/tv_name">-->
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:orientation="vertical">
 
-<!--        <TextView-->
-<!--            android:id="@+id/tv_author"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:ellipsize="end"-->
-<!--            android:lines="1"-->
-<!--            android:text="@string/author"-->
-<!--            android:textColor="@color/primaryText"-->
-<!--            android:textSize="12sp" />-->
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:text="@string/app_name"
+            android:textSize="16sp"
+            android:gravity="center_vertical"
+            tools:ignore="NestedWeights" />
+        <LinearLayout
+            android:id="@+id/ll_brief"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-<!--        <io.legado.app.ui.widget.LabelsBar-->
-<!--            android:id="@+id/ll_kind"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:orientation="horizontal" />-->
+            <io.legado.app.ui.widget.text.AccentBgTextView
+                android:id="@+id/tv_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="15dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="TXT"
+                android:maxLines="1"
+                android:maxWidth="50dp"
+                app:radius="2dp"
+                tools:ignore="HardcodedText,RtlHardcoded" />
 
-<!--        <TextView-->
-<!--            android:id="@+id/tv_lasted"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:ellipsize="end"-->
-<!--            android:lines="1"-->
-<!--            android:text="@string/last_read"-->
-<!--            android:textColor="@color/primaryText"-->
-<!--            android:textSize="12sp" />-->
+            <TextView
+                android:id="@+id/tv_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="15dp"
+                tools:ignore="RtlHardcoded"
+                tools:text="324kb" />
 
-<!--        <io.legado.app.ui.widget.text.MultilineTextView-->
-<!--            android:id="@+id/tv_introduce"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="match_parent"-->
-<!--            android:ellipsize="end"-->
-<!--            android:text="@string/book_intro"-->
-<!--            android:textColor="@color/primaryText"-->
-<!--            android:textSize="12sp" />-->
+            <TextView
+                android:id="@+id/tv_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="2017-05-22" />
+        </LinearLayout>
 
-<!--    </LinearLayout>-->
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        >
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="下载"
+            >
+        </Button>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

From 4d768beea6e9e987fed03877502233cfda7a0d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Sun, 15 May 2022 13:23:47 +0800
Subject: [PATCH 06/12] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/ui/book/info/BookInfoActivity.kt | 2 ++
 app/src/main/res/menu/book_info.xml                          | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 5b437029d..efa1f1526 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -127,6 +127,8 @@ class BookInfoActivity :
             viewModel.bookSource != null
         menu.findItem(R.id.menu_split_long_chapter)?.isVisible =
             viewModel.bookData.value?.isLocalTxt() ?: false
+        menu.findItem(R.id.menu_upload)?.isVisible =
+            viewModel.bookData.value?.isLocalBook() ?: false
         return super.onMenuOpened(featureId, menu)
     }
 
diff --git a/app/src/main/res/menu/book_info.xml b/app/src/main/res/menu/book_info.xml
index 911ba2332..675763611 100644
--- a/app/src/main/res/menu/book_info.xml
+++ b/app/src/main/res/menu/book_info.xml
@@ -14,6 +14,11 @@
         android:title="@string/share"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/menu_upload"
+        android:title="上传到云"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_refresh"
         android:title="@string/refresh"

From b84db00367448edb3f662b6ec665940cae5d8a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Sun, 15 May 2022 14:16:25 +0800
Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=B8=83=E5=B1=80=E4=B8=8A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/item_remote_book.xml | 160 ++++++++++---------
 1 file changed, 83 insertions(+), 77 deletions(-)

diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
index 06c2b5488..85af79d7f 100644
--- a/app/src/main/res/layout/item_remote_book.xml
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -1,104 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="60dp"
-    android:background="?attr/selectableItemBackground"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
+    android:layout_height="wrap_content">
 
-    <FrameLayout
-        android:layout_width="60dp"
-        android:layout_height="match_parent">
-        <!--选择是否添加文件-->
-        <io.legado.app.lib.theme.view.ThemeCheckBox
-            android:id="@+id/cb_select"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:clickable="false"
-            android:enabled="true"
-            android:focusable="true" />
-        <!--文件夹标识或已选文件标识-->
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/iv_icon"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="center"
-            android:visibility="invisible"
-            android:src="@drawable/ic_folder"
-            app:tint="@color/primaryText" />
-    </FrameLayout>
+    <io.legado.app.ui.widget.image.CoverImageView
+        android:id="@+id/iv_cover"
+        android:layout_width="80dp"
+        android:layout_height="110dp"
+        android:layout_margin="8dp"
+        android:contentDescription="@string/img_cover"
+        android:scaleType="centerCrop"
+        android:src="@drawable/image_cover_default"
+        android:transitionName="img_cover"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="UnusedAttribute" />
 
-    <LinearLayout
+
+    <TextView
+        android:id="@+id/tv_name"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:text="@string/app_name"
+        android:textColor="@color/primaryText"
+        android:textSize="16sp"
+        app:layout_constraintStart_toEndOf="@+id/iv_cover"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/ll_info"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        android:gravity="top"
+        android:layout_marginTop="8dp"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name">
 
         <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:singleLine="true"
-            android:text="@string/app_name"
-            android:textSize="16sp"
-            android:gravity="center_vertical"
-            tools:ignore="NestedWeights" />
-        <LinearLayout
-            android:id="@+id/ll_brief"
+            android:id="@+id/tv_size"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            tools:text="128kb"
+            android:textColor="@color/tv_text_summary"
+            android:textSize="13sp" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            tools:text="\u4e28"
+            android:textColor="@color/tv_text_summary"
+            android:textSize="11sp" />
 
-            <io.legado.app.ui.widget.text.AccentBgTextView
-                android:id="@+id/tv_tag"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="15dp"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text="TXT"
-                android:maxLines="1"
-                android:maxWidth="50dp"
-                app:radius="2dp"
-                tools:ignore="HardcodedText,RtlHardcoded" />
+        <TextView
+            android:id="@+id/tv_date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            tools:text="2022-12-7"
+            android:textColor="@color/tv_text_summary"
+            android:textSize="13sp" />
 
-            <TextView
-                android:id="@+id/tv_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="15dp"
-                tools:ignore="RtlHardcoded"
-                tools:text="324kb" />
 
-            <TextView
-                android:id="@+id/tv_date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="2017-05-22" />
-        </LinearLayout>
 
     </LinearLayout>
+    <io.legado.app.ui.widget.text.AccentBgTextView
+        android:id="@+id/tv_content_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="8dp"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:text="TXT"
+        android:maxLines="1"
+        android:maxWidth="50dp"
+        app:radius="2dp"
+        tools:ignore="HardcodedText,RtlHardcoded"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
+        app:layout_constraintTop_toBottomOf="@id/ll_info"
+        />
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
         android:orientation="vertical"
-        android:gravity="center_vertical"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="3dp"
+        android:id="@+id/tv_download"
         >
         <Button
+            android:id="@+id/tv_download1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="下载"
             >
+
         </Button>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3f1c95b7beafc8fd04089de457093bc6a7e08e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Mon, 16 May 2022 12:50:47 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat:=20=E4=B8=8B=E8=BD=BD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/remote/RemoteBookActivity.kt  |  16 ++-
 .../app/ui/book/remote/RemoteBookAdapter.kt   |  27 ++++-
 .../app/ui/book/remote/RemoteBookViewModel.kt | 107 ++++++++++++++----
 .../main/res/layout/activity_remote_book.xml  |  12 +-
 app/src/main/res/layout/item_remote_book.xml  |   5 +-
 5 files changed, 129 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
index d6fdc428c..4f8232a91 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -29,10 +29,13 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         initView()
+//        initEvent()
         initData()
 //        toastOnUi("远程书籍")
     }
 
+
+
     private fun initView() {
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.adapter = adapter
@@ -48,20 +51,21 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 //        viewModel.getRemoteBooks().observe(this, {
 //            adapter.submitList(it)
 //        })
-
+        viewModel.loadRemoteBookList()
 
         launch {
-            Log.e("TAG", "2")
-            viewModel.dataFlow.conflate().collect { remoteBooks ->
+            viewModel.dataFlow.collect { remoteBooks ->
                 adapter.setItems(remoteBooks)
             }
         }
 
 
 //        toastOnUi("1")
-        viewModel.loadRemoteBookList()
+
     }
-    override fun showRemoteBookInfo(book: Book) {
-        TODO("Not yet implemented")
+
+
+    override fun download(remoteBook: RemoteBook) {
+        viewModel.downloadRemoteBook(remoteBook.url)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
index d7f590408..99245f0f6 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
@@ -2,14 +2,23 @@ package io.legado.app.ui.book.remote
 
 import android.content.Context
 import android.view.ViewGroup
+import cn.hutool.core.date.LocalDateTimeUtil
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.RecyclerAdapter
 import io.legado.app.data.entities.Book
 import io.legado.app.databinding.ItemRemoteBookBinding
+import io.legado.app.utils.ConvertUtils
+import io.legado.app.utils.FileUtils
+import io.legado.app.utils.toastOnUi
+import splitties.init.appCtx
 
 
+/**
+ * 适配器
+ * @author qianfanguojin
+ */
 class RemoteBookAdapter (context: Context, val callBack: CallBack) :
-    RecyclerAdapter<String, ItemRemoteBookBinding>(context){
+    RecyclerAdapter<RemoteBook, ItemRemoteBookBinding>(context){
 
     override fun getViewBinding(parent: ViewGroup): ItemRemoteBookBinding {
         return ItemRemoteBookBinding.inflate(inflater, parent, false)
@@ -25,19 +34,29 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
     override fun convert(
         holder: ItemViewHolder,
         binding: ItemRemoteBookBinding,
-        item: String,
+        item: RemoteBook,
         payloads: MutableList<Any>
     ) {
         binding.run {
-           tvName.text = item
+            tvName.text = item.name.substringBeforeLast(".")
+            tvContentType.text = item.name.substringAfterLast(".")
+            tvSize.text = ConvertUtils.formatFileSize(item.size)
+            tvDate.text = LocalDateTimeUtil.format(LocalDateTimeUtil.of(item.lastModify), "yyyy-MM-dd")
         }
     }
 
     override fun registerListener(holder: ItemViewHolder, binding: ItemRemoteBookBinding) {
+        binding.btnDownload.setOnClickListener {
+                getItem(holder.layoutPosition)?.let {
+                    context.toastOnUi("开始下载")
+                    callBack.download(it)
+                }
+        }
+
 
     }
 
     interface CallBack {
-        fun showRemoteBookInfo(book: Book)
+        fun download(remoteBook: RemoteBook)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
index 5d646b725..31cef12b0 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
@@ -2,36 +2,43 @@ package io.legado.app.ui.book.remote
 
 import android.app.Application
 import android.util.Log
-import android.widget.Toast
 import io.legado.app.base.BaseViewModel
-import io.legado.app.utils.FileDoc
-import kotlinx.coroutines.Dispatchers
+import io.legado.app.constant.PreferKey
+import io.legado.app.lib.webdav.Authorization
+import io.legado.app.lib.webdav.WebDav
+import io.legado.app.utils.FileUtils
+import io.legado.app.utils.exists
+import io.legado.app.utils.externalFiles
+import io.legado.app.utils.getPrefString
+import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
+import splitties.init.appCtx
+import java.io.File
+import java.nio.charset.Charset
 import java.util.*
-import kotlin.reflect.typeOf
 
 class RemoteBookViewModel(application: Application): BaseViewModel(application){
-
+    private val remoteBookFolderName = "book_remote"
     private var dataCallback : DataCallback? = null
     var dataFlowStart: (() -> Unit)? = null
-    val dataFlow = callbackFlow<List<String>> {
+    private var authorization: Authorization? = null
+
+
+    val dataFlow = callbackFlow<List<RemoteBook>> {
 
-        val list = Collections.synchronizedList(ArrayList<String>())
+        val list = Collections.synchronizedList(ArrayList<RemoteBook>())
 
         dataCallback = object : DataCallback {
 
-            override fun setItems(remoteFiles: List<String>) {
+            override fun setItems(remoteFiles: List<RemoteBook>) {
                 list.clear()
                 list.addAll(remoteFiles)
-                Log.e("TAG", ": 1", )
                 trySend(list)
             }
 
-            override fun addItems(remoteFiles: List<String>) {
+            override fun addItems(remoteFiles: List<RemoteBook>) {
                 list.addAll(remoteFiles)
                 trySend(list)
             }
@@ -41,28 +48,88 @@ class RemoteBookViewModel(application: Application): BaseViewModel(application){
                 trySend(emptyList())
             }
         }
-
 //        withContext(Dispatchers.Main) {
 //            dataFlowStart?.invoke()
 //        }
 
         awaitClose {
-            dataCallback = null
+//            dataCallback = null
         }
-    }.flowOn(Dispatchers.Main)
+    }.flowOn(Dispatchers.IO)
 
     fun loadRemoteBookList() {
-        Log.e("TAG", dataCallback.toString(), )
-        dataCallback?.setItems(listOf("1", "2", "3"))
+        execute {
+            dataCallback?.clear()
+            kotlin.runCatching {
+                authorization = null
+                val account = appCtx.getPrefString(PreferKey.webDavAccount)
+                val password = appCtx.getPrefString(PreferKey.webDavPassword)
+                if (!account.isNullOrBlank() && !password.isNullOrBlank()) {
+                    val mAuthorization = Authorization(account, password)
+                    authorization = mAuthorization
+                }
+            }
+            authorization?.let { it ->
+                val remoteWebDavFileList = WebDav("http://txc.qianfanguojin.top/",it).listFiles()
+                val remoteList = remoteWebDavFileList.map {
+                    RemoteBook(it.displayName,it.urlName,it.size,"epub",it.lastModify)
+                }
+                dataCallback?.setItems(remoteList)
+            }
+//            dataCallback?.setItems()
+        }
+//        dataCallback?.setItems(listOf("1", "2", "3"))
     }
 
+    fun downloadRemoteBook(urlName: String) {
+        execute {
+//            kotlin.runCatching {
+//                val remoteWebDavFile = WebDav("http://txc.qianfanguojin.top/",authorization!!).getFile(url)
+//                val remoteBook = RemoteBook(remoteWebDavFile.displayName,remoteWebDavFile.urlName,remoteWebDavFile.size,"epub",remoteWebDavFile.lastModify)
+//                dataCallback?.addItems(listOf(remoteBook))
+//            }
+
+            kotlin.runCatching {
+                authorization = null
+                val account = appCtx.getPrefString(PreferKey.webDavAccount)
+                val password = appCtx.getPrefString(PreferKey.webDavPassword)
+                if (!account.isNullOrBlank() && !password.isNullOrBlank()) {
+                    val mAuthorization = Authorization(account, password)
+                    authorization = mAuthorization
+                }
+            }
+
+            authorization?.let { it ->
+                Log.e("TAG", "downloadRemoteBook: 1", )
+                val saveFolder = "${appCtx.externalFiles.absolutePath}${File.separator}${remoteBookFolderName}"
+                FileUtils.createFolderIfNotExist(saveFolder).run{
+
+//                Log.e("TAG", "downloadRemoteBook: 2 ${appCtx.externalFiles.absoluteFile}", )
+                val trueCodeURLName = String(urlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
+                withTimeout(15000L) {
+                    val webdav = WebDav("http://txc.qianfanguojin.top${trueCodeURLName}", it)
+                    webdav.downloadTo("${saveFolder}${trueCodeURLName}", true).apply {
+                    }
+                }
+                }
+            }
+        }
+    }
     interface DataCallback {
 
-        fun setItems(remoteFiles: List<String>)
+        fun setItems(remoteFiles: List<RemoteBook>)
 
-        fun addItems(remoteFiles: List<String>)
+        fun addItems(remoteFiles: List<RemoteBook>)
 
         fun clear()
 
     }
-}
\ No newline at end of file
+}
+
+data class RemoteBook(
+    val name: String,
+    val url: String,
+    val size: Long,
+    val contentType: String,
+    val lastModify: Long
+)
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_remote_book.xml b/app/src/main/res/layout/activity_remote_book.xml
index ed942a2cc..6af80a958 100644
--- a/app/src/main/res/layout/activity_remote_book.xml
+++ b/app/src/main/res/layout/activity_remote_book.xml
@@ -36,9 +36,11 @@
 
     </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
 
-    <io.legado.app.ui.widget.SelectActionBar
-        android:id="@+id/select_action_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent" />
+<!--    <io.legado.app.ui.widget.SelectActionBar-->
+<!--        android:id="@+id/select_action_bar"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@id/content_view"-->
+<!--        />-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
index 85af79d7f..ad986eaa6 100644
--- a/app/src/main/res/layout/item_remote_book.xml
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:lines="1"
-            tools:text="\u4e28"
+            android:text="\u4e28"
             android:textColor="@color/tv_text_summary"
             android:textSize="11sp" />
 
@@ -96,10 +96,9 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="3dp"
-        android:id="@+id/tv_download"
         >
         <Button
-            android:id="@+id/tv_download1"
+            android:id="@+id/btn_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="下载"

From 05951a98ea90fdf0db866da3b5206018b6bc61e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Tue, 17 May 2022 01:54:57 +0800
Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/info/BookInfoActivity.kt      |  15 +
 .../app/ui/book/remote/RemoteBookActivity.kt  |   9 +-
 .../app/ui/book/remote/RemoteBookAdapter.kt   |   4 +-
 .../app/ui/book/remote/RemoteBookManager.kt   |  51 ++++
 .../app/ui/book/remote/RemoteBookViewModel.kt |  69 +++--
 .../book/remote/manager/RemoteBookWebDav.kt   | 260 ++++++++++++++++++
 app/src/main/res/layout/item_remote_book.xml  |   2 +-
 7 files changed, 364 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
 create mode 100644 app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index efa1f1526..ce7562761 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -2,6 +2,7 @@ package io.legado.app.ui.book.info
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -31,6 +32,7 @@ import io.legado.app.ui.book.changesource.ChangeBookSourceDialog
 import io.legado.app.ui.book.group.GroupSelectDialog
 import io.legado.app.ui.book.info.edit.BookInfoEditActivity
 import io.legado.app.ui.book.read.ReadBookActivity
+import io.legado.app.ui.book.remote.manager.RemoteBookWebDav
 import io.legado.app.ui.book.search.SearchActivity
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
 import io.legado.app.ui.book.toc.TocActivityResult
@@ -198,6 +200,19 @@ class BookInfoActivity :
                 item.isChecked = !item.isChecked
                 if (!item.isChecked) longToastOnUi(R.string.need_more_time_load_content)
             }
+
+            R.id.menu_upload -> {
+                launch {
+                    val uri = Uri.parse(viewModel.bookData.value?.bookUrl.toString())
+                    RemoteBookWebDav.getFilePathFromContentUri(uri, contentResolver)
+//                    val doc = DocumentFile.fromTreeUri(appCtx,uri)
+
+                //                   if (uri.isContentScheme()){
+//                        uri.path
+//                    }
+//                    RemoteBookWebDav.upload()
+                }
+            }
         }
         return super.onCompatOptionsItemSelected(item)
     }
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
index 4f8232a91..c011c5cdd 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -1,19 +1,14 @@
 package io.legado.app.ui.book.remote
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.base.VMBaseActivity
-import io.legado.app.data.entities.Book
 
 
 import io.legado.app.databinding.ActivityRemoteBookBinding
-import io.legado.app.lib.theme.backgroundColor
-import io.legado.app.utils.toastOnUi
 
 import io.legado.app.utils.viewbindingdelegate.viewBinding
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.launch
 
 /**
@@ -51,7 +46,7 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 //        viewModel.getRemoteBooks().observe(this, {
 //            adapter.submitList(it)
 //        })
-        viewModel.loadRemoteBookList()
+//        viewModel.loadRemoteBookList()
 
         launch {
             viewModel.dataFlow.collect { remoteBooks ->
@@ -66,6 +61,6 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 
 
     override fun download(remoteBook: RemoteBook) {
-        viewModel.downloadRemoteBook(remoteBook.url)
+        viewModel.downloadRemoteBook(remoteBook.urlName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
index 99245f0f6..28722a866 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
@@ -38,8 +38,8 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
         payloads: MutableList<Any>
     ) {
         binding.run {
-            tvName.text = item.name.substringBeforeLast(".")
-            tvContentType.text = item.name.substringAfterLast(".")
+            tvName.text = item.filename
+            tvContentType.text = item.contentType
             tvSize.text = ConvertUtils.formatFileSize(item.size)
             tvDate.text = LocalDateTimeUtil.format(LocalDateTimeUtil.of(item.lastModify), "yyyy-MM-dd")
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
new file mode 100644
index 000000000..2c4d428a5
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
@@ -0,0 +1,51 @@
+package io.legado.app.ui.book.remote
+
+import android.content.ContentResolver
+import android.database.Cursor
+import android.net.Uri
+import android.provider.MediaStore
+import android.provider.OpenableColumns
+import android.webkit.MimeTypeMap
+import java.io.File
+import kotlin.random.Random
+
+
+abstract class RemoteBookManager {
+    protected val remoteBookFolder : String = "books"
+    protected val contentTypeList: ArrayList<String> = arrayListOf("epub","txt")
+    abstract suspend fun initRemoteContext()
+    abstract suspend fun getRemoteBookList(): MutableList<RemoteBook>
+    abstract suspend fun upload(localBookUrl: String): Boolean
+    abstract suspend fun delete(remoteBookUrl: String): Boolean
+    abstract suspend fun getRemoteBook(remoteBookUrl: String): RemoteBook
+
+    /**
+     * 把content uri转为 文件路径
+     *
+     * @param contentUri      要转换的content uri
+     * @param contentResolver 解析器
+     * @return
+     */
+
+    fun getFilePathFromContentUri(
+        contentUri: Uri,
+        contentResolver: ContentResolver
+    ): String? {
+        val filePath: String
+        if (contentUri.scheme == ContentResolver.SCHEME_FILE)
+            return File(requireNotNull(contentUri.path)).absolutePath
+        else if(contentUri.scheme == ContentResolver.SCHEME_CONTENT){
+            val filePathColumn = arrayOf(MediaStore.MediaColumns.DATA)
+            val cursor: Cursor? =
+                contentResolver.query(contentUri, filePathColumn, null, null, null)
+            cursor!!.moveToFirst()
+            val columnIndex: Int = cursor.getColumnIndex(filePathColumn[0])
+            filePath = cursor.getString(columnIndex)
+            cursor.close()
+            return filePath
+        }
+        return null
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
index 31cef12b0..d1feebd02 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
@@ -1,13 +1,15 @@
 package io.legado.app.ui.book.remote
 
 import android.app.Application
+import android.net.Uri
 import android.util.Log
 import io.legado.app.base.BaseViewModel
 import io.legado.app.constant.PreferKey
 import io.legado.app.lib.webdav.Authorization
 import io.legado.app.lib.webdav.WebDav
+import io.legado.app.model.localBook.LocalBook
+import io.legado.app.ui.book.remote.manager.RemoteBookWebDav
 import io.legado.app.utils.FileUtils
-import io.legado.app.utils.exists
 import io.legado.app.utils.externalFiles
 import io.legado.app.utils.getPrefString
 import kotlinx.coroutines.*
@@ -60,35 +62,18 @@ class RemoteBookViewModel(application: Application): BaseViewModel(application){
     fun loadRemoteBookList() {
         execute {
             dataCallback?.clear()
-            kotlin.runCatching {
-                authorization = null
-                val account = appCtx.getPrefString(PreferKey.webDavAccount)
-                val password = appCtx.getPrefString(PreferKey.webDavPassword)
-                if (!account.isNullOrBlank() && !password.isNullOrBlank()) {
-                    val mAuthorization = Authorization(account, password)
-                    authorization = mAuthorization
-                }
-            }
-            authorization?.let { it ->
-                val remoteWebDavFileList = WebDav("http://txc.qianfanguojin.top/",it).listFiles()
-                val remoteList = remoteWebDavFileList.map {
-                    RemoteBook(it.displayName,it.urlName,it.size,"epub",it.lastModify)
-                }
-                dataCallback?.setItems(remoteList)
-            }
+            RemoteBookWebDav.getRemoteBookList()
+        }
 //            dataCallback?.setItems()
         }
 //        dataCallback?.setItems(listOf("1", "2", "3"))
-    }
+
 
     fun downloadRemoteBook(urlName: String) {
+        val saveFolder = "${appCtx.externalFiles.absolutePath}${File.separator}${remoteBookFolderName}"
+        val trueCodeURLName = String(urlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
+        val saveFilePath = "${saveFolder}${trueCodeURLName}"
         execute {
-//            kotlin.runCatching {
-//                val remoteWebDavFile = WebDav("http://txc.qianfanguojin.top/",authorization!!).getFile(url)
-//                val remoteBook = RemoteBook(remoteWebDavFile.displayName,remoteWebDavFile.urlName,remoteWebDavFile.size,"epub",remoteWebDavFile.lastModify)
-//                dataCallback?.addItems(listOf(remoteBook))
-//            }
-
             kotlin.runCatching {
                 authorization = null
                 val account = appCtx.getPrefString(PreferKey.webDavAccount)
@@ -100,20 +85,31 @@ class RemoteBookViewModel(application: Application): BaseViewModel(application){
             }
 
             authorization?.let { it ->
-                Log.e("TAG", "downloadRemoteBook: 1", )
-                val saveFolder = "${appCtx.externalFiles.absolutePath}${File.separator}${remoteBookFolderName}"
                 FileUtils.createFolderIfNotExist(saveFolder).run{
-
-//                Log.e("TAG", "downloadRemoteBook: 2 ${appCtx.externalFiles.absoluteFile}", )
-                val trueCodeURLName = String(urlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
-                withTimeout(15000L) {
-                    val webdav = WebDav("http://txc.qianfanguojin.top${trueCodeURLName}", it)
-                    webdav.downloadTo("${saveFolder}${trueCodeURLName}", true).apply {
+                    withTimeout(15000L) {
+                        val webdav = WebDav(
+                            "http://txc.qianfanguojin.top${trueCodeURLName}",
+                            it
+                        )
+                        webdav.downloadTo(saveFilePath, true)
                     }
                 }
-                }
+            }
+        }.onFinally {
+            addToBookshelf(hashSetOf("${saveFolder}${trueCodeURLName}")){
+                Log.e("TAG", "downloadRemoteBook: add", )
             }
         }
+
+    }
+    fun addToBookshelf(uriList: HashSet<String>, finally: () -> Unit) {
+        execute {
+            uriList.forEach {
+                LocalBook.importFile(Uri.parse(it))
+            }
+        }.onFinally {
+            finally.invoke()
+        }
     }
     interface DataCallback {
 
@@ -127,9 +123,10 @@ class RemoteBookViewModel(application: Application): BaseViewModel(application){
 }
 
 data class RemoteBook(
-    val name: String,
-    val url: String,
+    val filename: String,
+    val urlName: String,
     val size: Long,
     val contentType: String,
     val lastModify: Long
-)
\ No newline at end of file
+)
+
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
new file mode 100644
index 000000000..5bbe4e746
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
@@ -0,0 +1,260 @@
+package io.legado.app.ui.book.remote.manager
+
+
+import io.legado.app.constant.PreferKey
+
+import io.legado.app.exception.NoStackTraceException
+import io.legado.app.help.config.AppConfig
+
+import io.legado.app.lib.webdav.Authorization
+import io.legado.app.lib.webdav.WebDav
+import io.legado.app.lib.webdav.WebDavFile
+
+import io.legado.app.ui.book.remote.RemoteBook
+import io.legado.app.ui.book.remote.RemoteBookManager
+import io.legado.app.utils.*
+import kotlinx.coroutines.runBlocking
+import splitties.init.appCtx
+import java.io.File
+import java.nio.charset.Charset
+
+object RemoteBookWebDav : RemoteBookManager() {
+    private const val defaultWebDavUrl = "https://dav.jianguoyun.com/dav/"
+    private var authorization: Authorization? = null
+    private val remoteBookUrl get() = "${rootWebDavUrl}${remoteBookFolder}"
+
+    init {
+        runBlocking {
+            initRemoteContext()
+        }
+    }
+
+    private val rootWebDavUrl: String
+        get() {
+            val configUrl = appCtx.getPrefString(PreferKey.webDavUrl)?.trim()
+            var url = if (configUrl.isNullOrEmpty()) defaultWebDavUrl else configUrl
+            if (!url.endsWith("/")) url = "${url}/"
+            AppConfig.webDavDir?.trim()?.let {
+                if (it.isNotEmpty()) {
+                    url = "${url}${it}/"
+                }
+            }
+            return url
+        }
+
+    override suspend fun initRemoteContext() {
+        kotlin.runCatching {
+            authorization = null
+            val account = appCtx.getPrefString(PreferKey.webDavAccount)
+            val password = appCtx.getPrefString(PreferKey.webDavPassword)
+            if (!account.isNullOrBlank() && !password.isNullOrBlank()) {
+                val mAuthorization = Authorization(account, password)
+                WebDav(rootWebDavUrl, mAuthorization).makeAsDir()
+                WebDav(remoteBookUrl, mAuthorization).makeAsDir()
+                authorization = mAuthorization
+            }
+        }.onFailure {
+            it.printStackTrace()
+        }
+    }
+
+    @Throws(Exception::class)
+    override suspend fun getRemoteBookList(): MutableList<RemoteBook> {
+        val remoteBooks = mutableListOf<RemoteBook>()
+
+        authorization?.let {
+            var remoteWebDavFileList : List<WebDavFile>? = null
+            kotlin.runCatching {
+                remoteWebDavFileList = WebDav(remoteBookUrl, it).listFiles()
+            }
+
+
+            remoteWebDavFileList = remoteWebDavFileList!!.reversed()
+            remoteWebDavFileList!!.forEach { webDavFile ->
+                val webDavFileName = webDavFile.displayName
+                val webDavUrlName = webDavFile.urlName
+
+                // 转码
+                val trueFileName = String(webDavFileName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
+                val trueUrlName = String(webDavUrlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
+
+                //分割文件名和后缀
+                val filename = trueFileName.substringBeforeLast(".")
+                val fileExtension = trueFileName.substringAfterLast(".")
+
+                //扩展名符合阅读的格式则认为是书籍
+                if (contentTypeList.contains(fileExtension)) {
+                    remoteBooks.add(RemoteBook(filename,trueUrlName,webDavFile.size,fileExtension,webDavFile.lastModify))
+                }
+            }
+        } ?: throw NoStackTraceException("webDav没有配置")
+        return remoteBooks
+    }
+
+    override suspend fun getRemoteBook(remoteBookUrl: String): RemoteBook {
+        TODO("Not yet implemented")
+    }
+
+    /**
+     * 上传本地导入的书籍到远程
+     */
+    override suspend fun upload(localBookUrl: String): Boolean {
+        if (!NetworkUtils.isAvailable()) return false
+        val localBookName = localBookUrl.substringAfterLast(File.separator)
+        authorization?.let {
+            val putUrl = "${remoteBookUrl}${File.separator}${localBookName}"
+            WebDav(putUrl, it).upload(localBookUrl)
+        }
+        return true
+    }
+
+    override suspend fun delete(remoteBookUrl: String): Boolean {
+        TODO("Not yet implemented")
+    }
+
+//    suspend fun showRestoreDialog(context: Context) {
+//        val names = withContext(Dispatchers.IO) { getBackupNames() }
+//        if (names.isNotEmpty()) {
+//            withContext(Dispatchers.Main) {
+//                context.selector(
+//                    title = context.getString(R.string.select_restore_file),
+//                    items = names
+//                ) { _, index ->
+//                    if (index in 0 until names.size) {
+//                        Coroutine.async {
+//                            restoreWebDav(names[index])
+//                        }.onError {
+//                            appCtx.toastOnUi("WebDav恢复出错\n${it.localizedMessage}")
+//                        }
+//                    }
+//                }
+//            }
+//        } else {
+//            throw NoStackTraceException("Web dav no back up file")
+//        }
+//    }
+//
+//    @Throws(WebDavException::class)
+//    suspend fun restoreWebDav(name: String) {
+//        authorization?.let {
+//            val webDav = WebDav(rootWebDavUrl + name, it)
+//            webDav.downloadTo(zipFilePath, true)
+//            @Suppress("BlockingMethodInNonBlockingContext")
+//            ZipUtils.unzipFile(zipFilePath, Backup.backupPath)
+//            Restore.restoreDatabase()
+//            Restore.restoreConfig()
+//        }
+//    }
+//
+//    suspend fun hasBackUp(): Boolean {
+//        authorization?.let {
+//            val url = "${rootWebDavUrl}${backupFileName}"
+//            return WebDav(url, it).exists()
+//        }
+//        return false
+//    }
+//
+//    suspend fun lastBackUp(): Result<WebDavFile?> {
+//        return kotlin.runCatching {
+//            authorization?.let {
+//                var lastBackupFile: WebDavFile? = null
+//                WebDav(rootWebDavUrl, it).listFiles().reversed().forEach { webDavFile ->
+//                    if (webDavFile.displayName.startsWith("backup")) {
+//                        if (lastBackupFile == null
+//                            || webDavFile.lastModify > lastBackupFile!!.lastModify
+//                        ) {
+//                            lastBackupFile = webDavFile
+//                        }
+//                    }
+//                }
+//                lastBackupFile
+//            }
+//        }
+//    }
+//
+//    @Throws(Exception::class)
+//    suspend fun backUpWebDav(path: String) {
+//        if (!NetworkUtils.isAvailable()) return
+//        authorization?.let {
+//            val paths = arrayListOf(*Backup.backupFileNames)
+//            for (i in 0 until paths.size) {
+//                paths[i] = path + File.separator + paths[i]
+//            }
+//            FileUtils.delete(zipFilePath)
+//            if (ZipUtils.zipFiles(paths, zipFilePath)) {
+//                val putUrl = "${rootWebDavUrl}${backupFileName}"
+//                WebDav(putUrl, it).upload(zipFilePath)
+//            }
+//        }
+//    }
+//
+//    suspend fun exportWebDav(byteArray: ByteArray, fileName: String) {
+//        if (!NetworkUtils.isAvailable()) return
+//        try {
+//            authorization?.let {
+//                // 如果导出的本地文件存在,开始上传
+//                val putUrl = exportsWebDavUrl + fileName
+//                WebDav(putUrl, it).upload(byteArray, "text/plain")
+//            }
+//        } catch (e: Exception) {
+//            val msg = "WebDav导出\n${e.localizedMessage}"
+//            AppLog.put(msg)
+//            appCtx.toastOnUi(msg)
+//        }
+//    }
+//
+//    fun uploadBookProgress(book: Book) {
+//        val authorization = authorization ?: return
+//        if (!syncBookProgress) return
+//        if (!NetworkUtils.isAvailable()) return
+//        Coroutine.async {
+//            val bookProgress = BookProgress(book)
+//            val json = GSON.toJson(bookProgress)
+//            val url = getProgressUrl(book)
+//            WebDav(url, authorization).upload(json.toByteArray(), "application/json")
+//        }.onError {
+//            AppLog.put("上传进度失败\n${it.localizedMessage}")
+//        }
+//    }
+//
+//    private fun getProgressUrl(book: Book): String {
+//        return bookProgressUrl + book.name + "_" + book.author + ".json"
+//    }
+//
+//    /**
+//     * 获取书籍进度
+//     */
+//    suspend fun getBookProgress(book: Book): BookProgress? {
+//        authorization?.let {
+//            val url = getProgressUrl(book)
+//            kotlin.runCatching {
+//                WebDav(url, it).download().let { byteArray ->
+//                    val json = String(byteArray)
+//                    if (json.isJson()) {
+//                        return GSON.fromJsonObject<BookProgress>(json).getOrNull()
+//                    }
+//                }
+//            }
+//        }
+//        return null
+//    }
+//
+//    suspend fun downloadAllBookProgress() {
+//        authorization ?: return
+//        if (!NetworkUtils.isAvailable()) return
+//        appDb.bookDao.all.forEach { book ->
+//            getBookProgress(book)?.let { bookProgress ->
+//                if (bookProgress.durChapterIndex > book.durChapterIndex
+//                    || (bookProgress.durChapterIndex == book.durChapterIndex
+//                            && bookProgress.durChapterPos > book.durChapterPos)
+//                ) {
+//                    book.durChapterIndex = bookProgress.durChapterIndex
+//                    book.durChapterPos = bookProgress.durChapterPos
+//                    book.durChapterTitle = bookProgress.durChapterTitle
+//                    book.durChapterTime = bookProgress.durChapterTime
+//                    appDb.bookDao.update(book)
+//                }
+//            }
+//        }
+//    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
index ad986eaa6..4d5ae1264 100644
--- a/app/src/main/res/layout/item_remote_book.xml
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:lines="1"
-            android:text="\u4e28"
+            android:text="丨"
             android:textColor="@color/tv_text_summary"
             android:textSize="11sp" />
 

From f05350f4904f57b04215b236543e31acfce6a5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Tue, 17 May 2022 16:16:54 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=20content://=20=E8=B7=AF=E5=BE=84=E7=9A=84?=
 =?UTF-8?q?=E4=B9=A6=E7=B1=8D=E7=9A=84=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/info/BookInfoActivity.kt      |  3 +-
 .../app/ui/book/remote/RemoteBookManager.kt   | 32 +------------------
 .../book/remote/manager/RemoteBookWebDav.kt   | 21 +++++++++---
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index ce7562761..25a901c78 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -204,13 +204,12 @@ class BookInfoActivity :
             R.id.menu_upload -> {
                 launch {
                     val uri = Uri.parse(viewModel.bookData.value?.bookUrl.toString())
-                    RemoteBookWebDav.getFilePathFromContentUri(uri, contentResolver)
 //                    val doc = DocumentFile.fromTreeUri(appCtx,uri)
 
                 //                   if (uri.isContentScheme()){
 //                        uri.path
 //                    }
-//                    RemoteBookWebDav.upload()
+                    RemoteBookWebDav.upload(uri)
                 }
             }
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
index 2c4d428a5..363649c80 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
@@ -15,37 +15,7 @@ abstract class RemoteBookManager {
     protected val contentTypeList: ArrayList<String> = arrayListOf("epub","txt")
     abstract suspend fun initRemoteContext()
     abstract suspend fun getRemoteBookList(): MutableList<RemoteBook>
-    abstract suspend fun upload(localBookUrl: String): Boolean
+    abstract suspend fun upload(localBookUri: Uri): Boolean
     abstract suspend fun delete(remoteBookUrl: String): Boolean
     abstract suspend fun getRemoteBook(remoteBookUrl: String): RemoteBook
-
-    /**
-     * 把content uri转为 文件路径
-     *
-     * @param contentUri      要转换的content uri
-     * @param contentResolver 解析器
-     * @return
-     */
-
-    fun getFilePathFromContentUri(
-        contentUri: Uri,
-        contentResolver: ContentResolver
-    ): String? {
-        val filePath: String
-        if (contentUri.scheme == ContentResolver.SCHEME_FILE)
-            return File(requireNotNull(contentUri.path)).absolutePath
-        else if(contentUri.scheme == ContentResolver.SCHEME_CONTENT){
-            val filePathColumn = arrayOf(MediaStore.MediaColumns.DATA)
-            val cursor: Cursor? =
-                contentResolver.query(contentUri, filePathColumn, null, null, null)
-            cursor!!.moveToFirst()
-            val columnIndex: Int = cursor.getColumnIndex(filePathColumn[0])
-            filePath = cursor.getString(columnIndex)
-            cursor.close()
-            return filePath
-        }
-        return null
-    }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
index 5bbe4e746..90e38914b 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
@@ -1,6 +1,7 @@
 package io.legado.app.ui.book.remote.manager
 
 
+import android.net.Uri
 import io.legado.app.constant.PreferKey
 
 import io.legado.app.exception.NoStackTraceException
@@ -9,6 +10,7 @@ import io.legado.app.help.config.AppConfig
 import io.legado.app.lib.webdav.Authorization
 import io.legado.app.lib.webdav.WebDav
 import io.legado.app.lib.webdav.WebDavFile
+import io.legado.app.ui.book.info.BookInfoActivity
 
 import io.legado.app.ui.book.remote.RemoteBook
 import io.legado.app.ui.book.remote.RemoteBookManager
@@ -98,12 +100,21 @@ object RemoteBookWebDav : RemoteBookManager() {
     /**
      * 上传本地导入的书籍到远程
      */
-    override suspend fun upload(localBookUrl: String): Boolean {
+    override suspend fun upload(localBookUri: Uri): Boolean {
         if (!NetworkUtils.isAvailable()) return false
-        val localBookName = localBookUrl.substringAfterLast(File.separator)
-        authorization?.let {
-            val putUrl = "${remoteBookUrl}${File.separator}${localBookName}"
-            WebDav(putUrl, it).upload(localBookUrl)
+
+        val localBookName = localBookUri.path?.substringAfterLast(File.separator)
+        val putUrl = "${remoteBookUrl}${File.separator}${localBookName}"
+        kotlin.runCatching {
+            authorization?.let {
+                if (localBookUri.isContentScheme()){
+                    WebDav(putUrl, it).upload(byteArray = localBookUri.readBytes(appCtx),contentType = "application/octet-stream")
+                }else{
+                    WebDav(putUrl, it).upload(localBookUri.path!!)
+                }
+            }
+        }.onFailure {
+            return false
         }
         return true
     }

From 1c8a0fd000fce3811c7cd3e16d5cd6f0224aeb46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Tue, 17 May 2022 18:10:17 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=BB=A5=E5=8F=8A=E4=B8=8B=E8=BD=BD=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86BUG=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/remote/RemoteBookActivity.kt  | 12 +++--
 .../app/ui/book/remote/RemoteBookAdapter.kt   |  9 ++--
 .../app/ui/book/remote/RemoteBookManager.kt   | 14 +++--
 .../app/ui/book/remote/RemoteBookViewModel.kt | 51 ++++++-------------
 .../book/remote/manager/RemoteBookWebDav.kt   | 42 ++++++++++-----
 app/src/main/res/layout/item_remote_book.xml  |  4 +-
 6 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
index c011c5cdd..c9a7f5f56 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -1,5 +1,6 @@
 package io.legado.app.ui.book.remote
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -46,8 +47,8 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 //        viewModel.getRemoteBooks().observe(this, {
 //            adapter.submitList(it)
 //        })
-//        viewModel.loadRemoteBookList()
-
+        binding.refreshProgressBar.isAutoLoading = true
+        viewModel.loadRemoteBookList()
         launch {
             viewModel.dataFlow.collect { remoteBooks ->
                 adapter.setItems(remoteBooks)
@@ -60,7 +61,10 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
     }
 
 
-    override fun download(remoteBook: RemoteBook) {
-        viewModel.downloadRemoteBook(remoteBook.urlName)
+    @SuppressLint("NotifyDataSetChanged")
+    override fun addToBookshelf(remoteBook: RemoteBook) {
+        viewModel.addToBookshelf(remoteBook){
+            adapter.notifyDataSetChanged()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
index 28722a866..010c15029 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
@@ -38,7 +38,7 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
         payloads: MutableList<Any>
     ) {
         binding.run {
-            tvName.text = item.filename
+            tvName.text = item.filename.substringBeforeLast(".")
             tvContentType.text = item.contentType
             tvSize.text = ConvertUtils.formatFileSize(item.size)
             tvDate.text = LocalDateTimeUtil.format(LocalDateTimeUtil.of(item.lastModify), "yyyy-MM-dd")
@@ -48,8 +48,9 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
     override fun registerListener(holder: ItemViewHolder, binding: ItemRemoteBookBinding) {
         binding.btnDownload.setOnClickListener {
                 getItem(holder.layoutPosition)?.let {
-                    context.toastOnUi("开始下载")
-                    callBack.download(it)
+                    context.toastOnUi("开始加入")
+                    callBack.addToBookshelf(it)
+                    context.toastOnUi("加入成功")
                 }
         }
 
@@ -57,6 +58,6 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
     }
 
     interface CallBack {
-        fun download(remoteBook: RemoteBook)
+        fun addToBookshelf(remoteBook: RemoteBook)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
index 363649c80..9fd1d1faf 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookManager.kt
@@ -1,13 +1,7 @@
 package io.legado.app.ui.book.remote
 
-import android.content.ContentResolver
-import android.database.Cursor
 import android.net.Uri
-import android.provider.MediaStore
-import android.provider.OpenableColumns
-import android.webkit.MimeTypeMap
-import java.io.File
-import kotlin.random.Random
+
 
 
 abstract class RemoteBookManager {
@@ -17,5 +11,9 @@ abstract class RemoteBookManager {
     abstract suspend fun getRemoteBookList(): MutableList<RemoteBook>
     abstract suspend fun upload(localBookUri: Uri): Boolean
     abstract suspend fun delete(remoteBookUrl: String): Boolean
-    abstract suspend fun getRemoteBook(remoteBookUrl: String): RemoteBook
+
+    /**
+     * @return String：下载到本地的路径
+     */
+    abstract suspend fun getRemoteBook(remoteBook: RemoteBook): String?
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
index d1feebd02..34493aec3 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
@@ -55,56 +55,37 @@ class RemoteBookViewModel(application: Application): BaseViewModel(application){
 //        }
 
         awaitClose {
-//            dataCallback = null
+            dataCallback = null
         }
     }.flowOn(Dispatchers.IO)
 
     fun loadRemoteBookList() {
         execute {
             dataCallback?.clear()
-            RemoteBookWebDav.getRemoteBookList()
+            val bookList = RemoteBookWebDav.getRemoteBookList()
+            dataCallback?.setItems(bookList)
         }
-//            dataCallback?.setItems()
-        }
-//        dataCallback?.setItems(listOf("1", "2", "3"))
+    }
 
 
-    fun downloadRemoteBook(urlName: String) {
-        val saveFolder = "${appCtx.externalFiles.absolutePath}${File.separator}${remoteBookFolderName}"
-        val trueCodeURLName = String(urlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
-        val saveFilePath = "${saveFolder}${trueCodeURLName}"
-        execute {
-            kotlin.runCatching {
-                authorization = null
-                val account = appCtx.getPrefString(PreferKey.webDavAccount)
-                val password = appCtx.getPrefString(PreferKey.webDavPassword)
-                if (!account.isNullOrBlank() && !password.isNullOrBlank()) {
-                    val mAuthorization = Authorization(account, password)
-                    authorization = mAuthorization
-                }
-            }
 
-            authorization?.let { it ->
-                FileUtils.createFolderIfNotExist(saveFolder).run{
-                    withTimeout(15000L) {
-                        val webdav = WebDav(
-                            "http://txc.qianfanguojin.top${trueCodeURLName}",
-                            it
-                        )
-                        webdav.downloadTo(saveFilePath, true)
-                    }
-                }
+    fun addToBookshelf(uriList: HashSet<String>, finally: () -> Unit) {
+        execute {
+            uriList.forEach {
+                LocalBook.importFile(Uri.parse(it))
             }
         }.onFinally {
-            addToBookshelf(hashSetOf("${saveFolder}${trueCodeURLName}")){
-                Log.e("TAG", "downloadRemoteBook: add", )
-            }
+            finally.invoke()
         }
-
     }
-    fun addToBookshelf(uriList: HashSet<String>, finally: () -> Unit) {
+
+    /**
+     * 添加书籍到本地书架
+     */
+    fun addToBookshelf(remoteBook: RemoteBook, finally: () -> Unit) {
         execute {
-            uriList.forEach {
+            val downloadBookPath = RemoteBookWebDav.getRemoteBook(remoteBook)
+            downloadBookPath?.let {
                 LocalBook.importFile(Uri.parse(it))
             }
         }.onFinally {
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
index 90e38914b..c099180c3 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
@@ -9,6 +9,7 @@ import io.legado.app.help.config.AppConfig
 
 import io.legado.app.lib.webdav.Authorization
 import io.legado.app.lib.webdav.WebDav
+import io.legado.app.lib.webdav.WebDavException
 import io.legado.app.lib.webdav.WebDavFile
 import io.legado.app.ui.book.info.BookInfoActivity
 
@@ -16,6 +17,7 @@ import io.legado.app.ui.book.remote.RemoteBook
 import io.legado.app.ui.book.remote.RemoteBookManager
 import io.legado.app.utils.*
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
 import splitties.init.appCtx
 import java.io.File
 import java.nio.charset.Charset
@@ -24,7 +26,7 @@ object RemoteBookWebDav : RemoteBookManager() {
     private const val defaultWebDavUrl = "https://dav.jianguoyun.com/dav/"
     private var authorization: Authorization? = null
     private val remoteBookUrl get() = "${rootWebDavUrl}${remoteBookFolder}"
-
+    private val localSaveFolder get() = "${appCtx.externalFiles.absolutePath}${File.separator}${remoteBookFolder}"
     init {
         runBlocking {
             initRemoteContext()
@@ -63,38 +65,52 @@ object RemoteBookWebDav : RemoteBookManager() {
     @Throws(Exception::class)
     override suspend fun getRemoteBookList(): MutableList<RemoteBook> {
         val remoteBooks = mutableListOf<RemoteBook>()
-
         authorization?.let {
+            //读取文件列表
             var remoteWebDavFileList : List<WebDavFile>? = null
             kotlin.runCatching {
                 remoteWebDavFileList = WebDav(remoteBookUrl, it).listFiles()
             }
-
-
+            //逆序文件排序
             remoteWebDavFileList = remoteWebDavFileList!!.reversed()
+            //转化远程文件信息到本地对象
             remoteWebDavFileList!!.forEach { webDavFile ->
                 val webDavFileName = webDavFile.displayName
-                val webDavUrlName = webDavFile.urlName
+                val webDavUrlName = "${remoteBookUrl}${File.separator}${webDavFile.displayName}"
 
                 // 转码
-                val trueFileName = String(webDavFileName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
-                val trueUrlName = String(webDavUrlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
+                //val trueFileName = String(webDavFileName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
+                //val trueUrlName = String(webDavUrlName.toByteArray(Charset.forName("GBK")), Charset.forName("UTF-8"))
 
-                //分割文件名和后缀
-                val filename = trueFileName.substringBeforeLast(".")
-                val fileExtension = trueFileName.substringAfterLast(".")
+                //分割后缀
+                val fileExtension = webDavFileName.substringAfterLast(".")
 
                 //扩展名符合阅读的格式则认为是书籍
                 if (contentTypeList.contains(fileExtension)) {
-                    remoteBooks.add(RemoteBook(filename,trueUrlName,webDavFile.size,fileExtension,webDavFile.lastModify))
+                    remoteBooks.add(RemoteBook(webDavFileName,webDavUrlName,webDavFile.size,fileExtension,webDavFile.lastModify))
                 }
             }
         } ?: throw NoStackTraceException("webDav没有配置")
         return remoteBooks
     }
 
-    override suspend fun getRemoteBook(remoteBookUrl: String): RemoteBook {
-        TODO("Not yet implemented")
+    override suspend fun getRemoteBook(remoteBook: RemoteBook): String? {
+        val saveFilePath= "${localSaveFolder}${File.separator}${remoteBook.filename}"
+        kotlin.runCatching {
+            authorization?.let {
+                FileUtils.createFolderIfNotExist(localSaveFolder).run{
+                        val webdav = WebDav(
+                            remoteBook.urlName,
+                            it
+                        )
+                        webdav.downloadTo(saveFilePath, true)
+                }
+            }
+        }.onFailure {
+            it.printStackTrace()
+            return null
+        }
+        return saveFilePath
     }
 
     /**
diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
index 4d5ae1264..ca84c2e51 100644
--- a/app/src/main/res/layout/item_remote_book.xml
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -97,12 +97,12 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="3dp"
         >
+
         <Button
             android:id="@+id/btn_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="下载"
-            >
+            android:text="加入书架">
 
         </Button>
     </LinearLayout>

From ac27c115e408d9dc106b0decc709b9f4bb42808c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=84=8F=E5=B8=86?= <1657098617@qq.com>
Date: Tue, 17 May 2022 21:42:40 +0800
Subject: [PATCH 12/12] =?UTF-8?q?feat:=20=E5=8F=98=E6=9B=B4=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E4=B8=BA=20string=20value=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/info/BookInfoActivity.kt      |  9 +++----
 .../app/ui/book/remote/RemoteBookActivity.kt  | 25 ++++++++-----------
 .../app/ui/book/remote/RemoteBookAdapter.kt   |  7 +-----
 .../app/ui/book/remote/RemoteBookViewModel.kt | 13 ++--------
 app/src/main/res/layout/item_remote_book.xml  |  5 ++--
 app/src/main/res/menu/book_info.xml           |  2 +-
 app/src/main/res/menu/main_bookshelf.xml      |  2 +-
 app/src/main/res/values/strings.xml           |  7 ++++++
 8 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 25a901c78..68ca73cbb 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -204,12 +204,11 @@ class BookInfoActivity :
             R.id.menu_upload -> {
                 launch {
                     val uri = Uri.parse(viewModel.bookData.value?.bookUrl.toString())
-//                    val doc = DocumentFile.fromTreeUri(appCtx,uri)
+                    if (RemoteBookWebDav.upload(uri))
+                        toastOnUi(getString(R.string.upload_book_success))
+                    else
+                        toastOnUi(getString(R.string.upload_book_fail))
 
-                //                   if (uri.isContentScheme()){
-//                        uri.path
-//                    }
-                    RemoteBookWebDav.upload(uri)
                 }
             }
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
index c9a7f5f56..0ebcd901e 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -4,12 +4,15 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
+import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 
 
 import io.legado.app.databinding.ActivityRemoteBookBinding
+import io.legado.app.utils.toastOnUi
 
 import io.legado.app.utils.viewbindingdelegate.viewBinding
+import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.launch
 
 /**
@@ -28,42 +31,34 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding,RemoteBookVi
 //        initEvent()
         initData()
 //        toastOnUi("远程书籍")
+        onFinally()
     }
 
 
 
+
     private fun initView() {
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.adapter = adapter
-//        binding.layTop.setBackgroundColor(backgroundColor)
-//        binding.recyclerView.layoutManager = LinearLayoutManager(this)
-//        binding.recyclerView.adapter = adapter
-//        binding.selectActionBar.setMainActionText(R.string.add_to_shelf)
-//        binding.selectActionBar.inflateMenu(R.menu.import_book_sel)
-//        binding.selectActionBar.setOnMenuItemClickListener(this)
-//        binding.selectActionBar.setCallBack(this)
     }
     private fun initData() {
-//        viewModel.getRemoteBooks().observe(this, {
-//            adapter.submitList(it)
-//        })
         binding.refreshProgressBar.isAutoLoading = true
         viewModel.loadRemoteBookList()
         launch {
-            viewModel.dataFlow.collect { remoteBooks ->
+            viewModel.dataFlow.conflate().collect { remoteBooks ->
                 adapter.setItems(remoteBooks)
             }
+            binding.refreshProgressBar.isAutoLoading = false
         }
-
-
-//        toastOnUi("1")
-
     }
 
+    private fun onFinally() {
 
+    }
     @SuppressLint("NotifyDataSetChanged")
     override fun addToBookshelf(remoteBook: RemoteBook) {
         viewModel.addToBookshelf(remoteBook){
+            toastOnUi(getString(R.string.download_book_fail))
             adapter.notifyDataSetChanged()
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
index 010c15029..36dd38f86 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
@@ -5,12 +5,8 @@ import android.view.ViewGroup
 import cn.hutool.core.date.LocalDateTimeUtil
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.RecyclerAdapter
-import io.legado.app.data.entities.Book
 import io.legado.app.databinding.ItemRemoteBookBinding
 import io.legado.app.utils.ConvertUtils
-import io.legado.app.utils.FileUtils
-import io.legado.app.utils.toastOnUi
-import splitties.init.appCtx
 
 
 /**
@@ -38,6 +34,7 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
         payloads: MutableList<Any>
     ) {
         binding.run {
+            //Todo：需要判断书籍是否已经加入书架，来改变“下载”按钮的文本，暂时还没有比较好的方案
             tvName.text = item.filename.substringBeforeLast(".")
             tvContentType.text = item.contentType
             tvSize.text = ConvertUtils.formatFileSize(item.size)
@@ -48,9 +45,7 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
     override fun registerListener(holder: ItemViewHolder, binding: ItemRemoteBookBinding) {
         binding.btnDownload.setOnClickListener {
                 getItem(holder.layoutPosition)?.let {
-                    context.toastOnUi("开始加入")
                     callBack.addToBookshelf(it)
-                    context.toastOnUi("加入成功")
                 }
         }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
index 34493aec3..44f4071b6 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookViewModel.kt
@@ -2,30 +2,21 @@ package io.legado.app.ui.book.remote
 
 import android.app.Application
 import android.net.Uri
-import android.util.Log
+import androidx.lifecycle.MutableLiveData
 import io.legado.app.base.BaseViewModel
-import io.legado.app.constant.PreferKey
-import io.legado.app.lib.webdav.Authorization
-import io.legado.app.lib.webdav.WebDav
 import io.legado.app.model.localBook.LocalBook
 import io.legado.app.ui.book.remote.manager.RemoteBookWebDav
-import io.legado.app.utils.FileUtils
-import io.legado.app.utils.externalFiles
-import io.legado.app.utils.getPrefString
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flowOn
-import splitties.init.appCtx
-import java.io.File
-import java.nio.charset.Charset
 import java.util.*
 
 class RemoteBookViewModel(application: Application): BaseViewModel(application){
     private val remoteBookFolderName = "book_remote"
     private var dataCallback : DataCallback? = null
+    var isRemoteBookLiveData = MutableLiveData<Boolean>()
     var dataFlowStart: (() -> Unit)? = null
-    private var authorization: Authorization? = null
 
 
     val dataFlow = callbackFlow<List<RemoteBook>> {
diff --git a/app/src/main/res/layout/item_remote_book.xml b/app/src/main/res/layout/item_remote_book.xml
index ca84c2e51..ef032b4e3 100644
--- a/app/src/main/res/layout/item_remote_book.xml
+++ b/app/src/main/res/layout/item_remote_book.xml
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:lines="1"
-            android:text="丨"
+            android:text="@string/separator"
             android:textColor="@color/tv_text_summary"
             android:textSize="11sp" />
 
@@ -102,7 +102,8 @@
             android:id="@+id/btn_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="加入书架">
+            tools:text="加入书架"
+            android:text="@string/nb_file_add_shelf">
 
         </Button>
     </LinearLayout>
diff --git a/app/src/main/res/menu/book_info.xml b/app/src/main/res/menu/book_info.xml
index 675763611..80633d3cb 100644
--- a/app/src/main/res/menu/book_info.xml
+++ b/app/src/main/res/menu/book_info.xml
@@ -16,7 +16,7 @@
 
     <item
         android:id="@+id/menu_upload"
-        android:title="上传到云"
+        android:title="@string/upload_to_remote"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/menu/main_bookshelf.xml b/app/src/main/res/menu/main_bookshelf.xml
index 0ad539401..fef446a1f 100644
--- a/app/src/main/res/menu/main_bookshelf.xml
+++ b/app/src/main/res/menu/main_bookshelf.xml
@@ -13,7 +13,7 @@
     <item
         android:id="@+id/menu_remote"
         android:icon="@drawable/ic_add"
-        android:title="远程书籍"
+        android:title="@string/add_remote_book"
         app:showAsAction="always" />
 
     <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 262d98d30..a2b8c594c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,13 @@
     <string name="tip_perm_request_storage">Legado needs storage access to find and read books. please go "App Settings" to allow "Storage permission".</string>
 
     <!--Other-->
+    <string name="upload_book_success" translatable="false">Upload Success</string>
+    <string name="upload_book_fail" translatable="false">Upload Fail</string>
+    <string name="download_book_success" translatable="false">Download Success</string>
+    <string name="download_book_fail" translatable="false">Download Fail</string>
+    <string name="separator" translatable="false">丨</string>
+    <string name="upload_to_remote" translatable="false">Upload</string>
+    <string name="add_remote_book" translatable="false">Add Remote</string>
     <string name="menu_backup">Home</string>
     <string name="menu_restore">Restore</string>
     <string name="menu_import_old">Import Legado data</string>