From 86f6adba066edf2d07240b1c51a75b55d9723e0b Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Tue, 1 Feb 2022 19:04:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=94=99=E8=AF=AF=E5=87=80=E5=8C=96?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=82=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/data/entities/BookChapter.kt  | 2 ++
 app/src/main/java/io/legado/app/help/ContentProcessor.kt  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
index 5c80fc034..b6581689e 100644
--- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
@@ -80,6 +80,7 @@ data class BookChapter(
         chineseConvert: Boolean = true,
     ): String {
         var displayTitle = title.replace(AppPattern.rnRegex, "")
+        val mDisplayTitle = displayTitle
         if (useReplace && replaceRules != null) {
             replaceRules.forEach { item ->
                 if (item.pattern.isNotEmpty()) {
@@ -95,6 +96,7 @@ data class BookChapter(
                 }
             }
         }
+        if (displayTitle.isBlank()) displayTitle = mDisplayTitle
         if (chineseConvert) {
             when (AppConfig.chineseConverterType) {
                 1 -> displayTitle = ChineseUtils.t2s(displayTitle)
diff --git a/app/src/main/java/io/legado/app/help/ContentProcessor.kt b/app/src/main/java/io/legado/app/help/ContentProcessor.kt
index 32f36c09d..7ed17f880 100644
--- a/app/src/main/java/io/legado/app/help/ContentProcessor.kt
+++ b/app/src/main/java/io/legado/app/help/ContentProcessor.kt
@@ -77,10 +77,6 @@ class ContentProcessor private constructor(
             //重新分段
             mContent = ContentHelp.reSegment(mContent, chapter.title)
         }
-        if (includeTitle) {
-            //重新添加标题
-            mContent = chapter.getDisplayTitle() + "\n" + mContent
-        }
         if (useReplace && book.getUseReplaceRule()) {
             //替换
             mContent = replaceContent(mContent)
@@ -96,6 +92,10 @@ class ContentProcessor private constructor(
                 appCtx.toastOnUi("简繁转换出错")
             }
         }
+        if (includeTitle) {
+            //重新添加标题
+            mContent = chapter.getDisplayTitle() + "\n" + mContent
+        }
         val contents = arrayListOf<String>()
         mContent.split("\n").forEach { str ->
             val paragraph = str.trim {