From 379dc79c62d6ee2ebf42f1a2747fa47467e07a36 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 16 Apr 2022 20:09:55 +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 --- .../java/io/legado/app/ui/book/read/page/entities/TextPage.kt | 4 ++-- .../legado/app/ui/book/read/page/provider/ChapterProvider.kt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt index d82c154f8..443a4633a 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt @@ -128,14 +128,14 @@ data class TextPage( for ((index, textLine) in textLines.withIndex()) { if (aloudSpanStart > lineStart && aloudSpanStart < lineStart + textLine.text.length) { for (i in index - 1 downTo 0) { - if (textLines[i].text.endsWith("\n")) { + if (textLines[i].isLastLine) { break } else { textLines[i].isReadAloud = true } } for (i in index until textLines.size) { - if (textLines[i].text.endsWith("\n")) { + if (textLines[i].isLastLine) { textLines[i].isReadAloud = true break } else { diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt index 6efc31503..0f1742b45 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt @@ -377,7 +377,9 @@ object ChapterProvider { } } stringBuilder.append(words) - if (textLine.isLastLine) stringBuilder.append("\n") + if (textLine.isLastLine) { + stringBuilder.append("\n") + } textPages.last().textLines.add(textLine) textLine.upTopBottom(durY, textPaint) durY += textPaint.textHeight * lineSpacingExtra