YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化 #5537

Browse Source
This commit is contained in:
Horis
2025-11-13 08:36:48 +08:00
parent 43a89baf00
commit e13c12f00c
6 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/model/ReadBook.kt
+7 -2
View File
@@ -447,10 +447,15 @@ object ReadBook : CoroutineScope by MainScope() {
} }
} }
fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) { fun openChapter(
index: Int,
durChapterPos: Int = 0,
upContent: Boolean = true,
success: (() -> Unit)? = null
) {
if (index < chapterSize) { if (index < chapterSize) {
clearTextChapter() clearTextChapter()
callBack?.upContent() if (upContent) callBack?.upContent()
durChapterIndex = index durChapterIndex = index
ReadBook.durChapterPos = durChapterPos ReadBook.durChapterPos = durChapterPos
saveRead() saveRead()
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+22 -8
View File
@@ -1329,10 +1329,17 @@ class ReadBookActivity : BaseReadBookActivity(),
ReadAloud.upReadAloudClass() ReadAloud.upReadAloudClass()
val scrollPageAnim = ReadBook.pageAnim() == 3 val scrollPageAnim = ReadBook.pageAnim() == 3
if (scrollPageAnim) { if (scrollPageAnim) {
val line = binding.readView.getCurVisibleFirstLine() val pos = binding.readView.getReadAloudPos()
if (line != null) { if (pos != null) {
ReadBook.durChapterPos = line.chapterPosition val (index, line) = pos
ReadBook.readAloud(startPos = line.pagePosition) if (ReadBook.durChapterIndex != index) {
ReadBook.openChapter(index, line.chapterPosition, false) {
ReadBook.readAloud(startPos = line.pagePosition)
}
} else {
ReadBook.durChapterPos = line.chapterPosition
ReadBook.readAloud(startPos = line.pagePosition)
}
} else { } else {
ReadBook.readAloud() ReadBook.readAloud()
} }
@@ -1345,10 +1352,17 @@ class ReadBookActivity : BaseReadBookActivity(),
val scrollPageAnim = ReadBook.pageAnim() == 3 val scrollPageAnim = ReadBook.pageAnim() == 3
if (scrollPageAnim && pageChanged) { if (scrollPageAnim && pageChanged) {
pageChanged = false pageChanged = false
val line = binding.readView.getCurVisibleFirstLine() val pos = binding.readView.getReadAloudPos()
if (line != null) { if (pos != null) {
ReadBook.durChapterPos = line.chapterPosition val (index, line) = pos
ReadBook.readAloud(startPos = line.pagePosition) if (ReadBook.durChapterIndex != index) {
ReadBook.openChapter(index, line.chapterPosition, false) {
ReadBook.readAloud(startPos = line.pagePosition)
}
} else {
ReadBook.durChapterPos = line.chapterPosition
ReadBook.readAloud(startPos = line.pagePosition)
}
} else { } else {
ReadBook.readAloud() ReadBook.readAloud()
} }
app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
+1 -1
View File
@@ -328,7 +328,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
} }
fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) { fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) {
ReadBook.openChapter(index, durChapterPos, success) ReadBook.openChapter(index, durChapterPos, success = success)
} }
fun removeFromBookshelf(success: (() -> Unit)?) { fun removeFromBookshelf(success: (() -> Unit)?) {
app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt
+2 -2
View File
@@ -449,7 +449,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
return visiblePage return visiblePage
} }
fun getCurVisibleFirstLine(): TextLine? { fun getReadAloudPos(): Pair<Int, TextLine>? {
var relativeOffset: Float var relativeOffset: Float
for (relativePos in 0..2) { for (relativePos in 0..2) {
relativeOffset = relativeOffset(relativePos) relativeOffset = relativeOffset(relativePos)
@@ -467,7 +467,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
lineTop += relativeOffset lineTop += relativeOffset
lineBottom += relativeOffset lineBottom += relativeOffset
} }
return visibleLine return textPage.chapterIndex to visibleLine
} }
} }
} }
app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
+2 -2
View File
@@ -426,8 +426,8 @@ class PageView(context: Context) : FrameLayout(context) {
return binding.contentTextView.getCurVisiblePage() return binding.contentTextView.getCurVisiblePage()
} }
fun getCurVisibleFirstLine(): TextLine? { fun getReadAloudPos(): Pair<Int, TextLine>? {
return binding.contentTextView.getCurVisibleFirstLine() return binding.contentTextView.getReadAloudPos()
} }
fun markAsMainView() { fun markAsMainView() {
app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
+2 -2
View File
@@ -675,8 +675,8 @@ class ReadView(context: Context, attrs: AttributeSet) :
return curPage.getCurVisiblePage() return curPage.getCurVisiblePage()
} }
fun getCurVisibleFirstLine(): TextLine? { fun getReadAloudPos(): Pair<Int, TextLine>? {
return curPage.getCurVisibleFirstLine() return curPage.getReadAloudPos()
} }
fun invalidateTextPage() { fun invalidateTextPage() {