From 18a7c351967f7fbd2952a1f6e327945c08b6bc69 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Wed, 16 Feb 2022 22:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/read/ReadBookActivity.kt      | 26 +++++++++++++++++--
 .../app/ui/book/read/ReadBookViewModel.kt     | 22 +++++++++++++++-
 app/src/main/res/menu/book_read.xml           | 23 +++++++++++++++-
 app/src/main/res/values-es-rES/strings.xml    |  3 +++
 app/src/main/res/values-ja-rJP/strings.xml    |  3 +++
 app/src/main/res/values-pt-rBR/strings.xml    |  3 +++
 app/src/main/res/values-zh-rHK/strings.xml    |  3 +++
 app/src/main/res/values-zh-rTW/strings.xml    |  3 +++
 app/src/main/res/values-zh/strings.xml        |  3 +++
 app/src/main/res/values/strings.xml           |  3 +++
 10 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index da828bc2e..14ef665dc 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -241,14 +241,36 @@ class ReadBookActivity : BaseReadBookActivity(),
                     showDialogFragment(ChangeSourceDialog(it.name, it.author))
                 }
             }
-            R.id.menu_refresh -> {
+            R.id.menu_refresh_dur -> {
                 if (ReadBook.bookSource == null) {
                     upContent()
                 } else {
                     ReadBook.book?.let {
                         ReadBook.curTextChapter = null
                         binding.readView.upContent()
-                        viewModel.refreshContent(it)
+                        viewModel.refreshContentDur(it)
+                    }
+                }
+            }
+            R.id.menu_refresh_after -> {
+                if (ReadBook.bookSource == null) {
+                    upContent()
+                } else {
+                    ReadBook.book?.let {
+                        ReadBook.clearTextChapter()
+                        binding.readView.upContent()
+                        viewModel.refreshContentAfter(it)
+                    }
+                }
+            }
+            R.id.menu_refresh_all -> {
+                if (ReadBook.bookSource == null) {
+                    upContent()
+                } else {
+                    ReadBook.book?.let {
+                        ReadBook.clearTextChapter()
+                        binding.readView.upContent()
+                        viewModel.refreshContentAll(it)
                     }
                 }
             }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
index a83bc0352..d4ebe3679 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
@@ -253,7 +253,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    fun refreshContent(book: Book) {
+    fun refreshContentDur(book: Book) {
         execute {
             appDb.bookChapterDao.getChapter(book.bookUrl, ReadBook.durChapterIndex)
                 ?.let { chapter ->
@@ -263,6 +263,26 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
+    fun refreshContentAfter(book: Book) {
+        execute {
+            appDb.bookChapterDao.getChapterList(
+                book.bookUrl,
+                ReadBook.durChapterIndex,
+                book.totalChapterNum
+            ).forEach { chapter ->
+                BookHelp.delContent(book, chapter)
+            }
+            ReadBook.loadContent(false)
+        }
+    }
+
+    fun refreshContentAll(book: Book) {
+        execute {
+            BookHelp.clearCache(book)
+            ReadBook.loadContent(false)
+        }
+    }
+
     fun reverseContent(book: Book) {
         execute {
             appDb.bookChapterDao.getChapter(book.bookUrl, ReadBook.durChapterIndex)
diff --git a/app/src/main/res/menu/book_read.xml b/app/src/main/res/menu/book_read.xml
index d96cf8140..b8372597f 100644
--- a/app/src/main/res/menu/book_read.xml
+++ b/app/src/main/res/menu/book_read.xml
@@ -15,7 +15,28 @@
             android:id="@+id/menu_refresh"
             android:icon="@drawable/ic_refresh_black_24dp"
             android:title="@string/refresh"
-            app:showAsAction="always" />
+            app:showAsAction="always">
+
+            <menu>
+
+                <item
+                    android:id="@+id/menu_refresh_dur"
+                    android:title="@string/menu_refresh_dur"
+                    app:showAsAction="never" />
+
+                <item
+                    android:id="@+id/menu_refresh_after"
+                    android:title="@string/menu_refresh_after"
+                    app:showAsAction="never" />
+
+                <item
+                    android:id="@+id/menu_refresh_all"
+                    android:title="@string/menu_refresh_all"
+                    app:showAsAction="never" />
+
+            </menu>
+
+        </item>
 
         <item
             android:id="@+id/menu_download"
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 3ba4ae078..548a559bc 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -934,5 +934,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">加入QQ频道</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 854f5be4e..65f7212d1 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -937,5 +937,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">加入QQ频道</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 554ab6db7..a175bdfd3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -937,5 +937,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">加入QQ频道</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index f4e65445f..18c955c57 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -934,5 +934,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">加入QQ频道</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8b455ea86..c173bf2c1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -936,5 +936,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">加入QQ频道</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9aa6a1deb..400c9a194 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -936,5 +936,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">加入QQ频道</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab748bd20..23a704a5f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -937,5 +937,8 @@
     <string name="scope_content">作用于正文</string>
     <string name="join_qq_channel">Join QQ channel</string>
     <string name="qq_channel_summary">点击加入阅读QQ频道</string>
+    <string name="menu_refresh_dur">刷新当前章节</string>
+    <string name="menu_refresh_after">刷新之后章节</string>
+    <string name="menu_refresh_all">刷新全部章节</string>
     <!-- string end -->
 </resources>