From 0e30e2be93baca22e32993595e68cd4f7417396b Mon Sep 17 00:00:00 2001 From: hingbong Date: Wed, 12 Feb 2020 13:55:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=80=E7=B9=81=E4=BD=93?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=20=E5=8E=9F=E6=9C=AC=E6=98=AF=E6=AF=8F?= =?UTF-8?q?=E4=B8=80=E9=A1=B5=E5=8A=A0=E8=BD=BD=E6=97=B6=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?,=20=E7=8E=B0=E6=94=B9=E4=B8=BA=E7=AB=A0=E8=8A=82=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=97=B6=E5=B0=86=E6=9C=AA=E5=A4=84=E7=90=86=E6=96=87?= =?UTF-8?q?=E5=AD=97,=20=E5=9B=A0=E4=B8=BA=E5=A6=82=E6=9E=9C=E5=9C=A8?= =?UTF-8?q?=E6=AF=8F=E4=B8=80=E9=A1=B5=E6=89=8D=E5=8A=A0=E8=BD=BD=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=E5=8A=A0=E8=BD=BD=E7=9A=84=20String=20=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=20SpannableStringBuilder,=20=E6=AF=8F?= =?UTF-8?q?=E4=B8=80=E7=AB=A0=E6=A0=87=E9=A2=98=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=B0=B1=E4=B8=A2=E5=A4=B1=E4=BA=86,=20=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E8=AF=BB=E4=B9=A6=E7=95=8C=E9=9D=A2=E4=B8=8B=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E7=AB=A0=E8=8A=82=E5=90=8D=E4=B9=9F=E8=B7=9F=E7=9D=80=E7=AE=80?= =?UTF-8?q?=E7=B9=81=E8=BD=AC=E6=8D=A2,=20=E7=95=8C=E9=9D=A2=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../legado/app/ui/book/read/page/ChapterProvider.kt | 13 +++++++++++-- .../io/legado/app/ui/book/read/page/ContentView.kt | 10 +--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt index 63cc6748d..0ceab8b2c 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt @@ -6,8 +6,10 @@ import android.text.style.ForegroundColorSpan import android.text.style.RelativeSizeSpan import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT +import com.github.houbb.opencc4j.util.ZhConverterUtil import io.legado.app.App import io.legado.app.data.entities.BookChapter +import io.legado.app.help.AppConfig import io.legado.app.lib.theme.accentColor @@ -27,7 +29,7 @@ object ChapterProvider { val textPages = arrayListOf() val pageLines = arrayListOf() val pageLengths = arrayListOf() - var surplusText = content + var surplusText = convertChinese(content) var pageIndex = 0 while (surplusText.isNotEmpty()) { val spannableStringBuilder = @@ -65,7 +67,7 @@ object ChapterProvider { lastCharNum, spannableStringBuilder.length ), - title = bookChapter.title, + title = convertChinese(bookChapter.title), chapterSize = chapterSize, chapterIndex = bookChapter.index ) @@ -101,4 +103,11 @@ object ChapterProvider { fun upReadAloudSpan() { readAloudSpan = ForegroundColorSpan(App.INSTANCE.accentColor) } + + private fun convertChinese(string: String): String = + when (AppConfig.isChineseConverterEnable) { + "1" -> ZhConverterUtil.toTraditional(string) + "2" -> ZhConverterUtil.toSimple(string) + else -> string + } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt index f53b1550d..cc9e9e666 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt @@ -9,11 +9,9 @@ import android.view.Gravity import android.widget.FrameLayout import android.widget.ImageView import androidx.appcompat.widget.AppCompatImageView -import com.github.houbb.opencc4j.util.ZhConverterUtil import io.legado.app.R import io.legado.app.constant.AppConst.TIME_FORMAT import io.legado.app.constant.PreferKey -import io.legado.app.help.AppConfig import io.legado.app.help.ReadBookConfig import io.legado.app.utils.* import kotlinx.android.synthetic.main.view_book_page.view.* @@ -113,13 +111,7 @@ class ContentView : FrameLayout { fun setContent(textPage: TextPage?) { if (textPage != null) { content_text_view.gravity = Gravity.START - content_text_view.text = if ("0" != AppConfig.isChineseConverterEnable) { - if ("1" == AppConfig.isChineseConverterEnable) - ZhConverterUtil.toTraditional(textPage.text.toString()) - else ZhConverterUtil.toSimple(textPage.text.toString()) - } else { - textPage.text - } + content_text_view.text = textPage.text tv_bottom_left.text = textPage.title pageSize = textPage.pageSize setPageIndex(textPage.index)