yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-03-07 17:20:54 +08:00
parent bb3ab9ba4f
commit a2dedd590d
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
+1 -1
View File
@@ -118,7 +118,7 @@ abstract class BaseReadAloudService : BaseService(),
contentList.clear() contentList.clear()
if (getPrefBoolean(PreferKey.readAloudByPage)) { if (getPrefBoolean(PreferKey.readAloudByPage)) {
for (index in pageIndex..textChapter.lastIndex) { for (index in pageIndex..textChapter.lastIndex) {
textChapter.page(index)?.text?.split("\n")?.let { textChapter.getPage(index)?.text?.split("\n")?.let {
contentList.addAll(it) contentList.addAll(it)
} }
} }
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+4 -3
View File
@@ -314,7 +314,7 @@ class ReadBookActivity : BaseReadBookActivity(),
R.id.menu_download -> showDownloadDialog() R.id.menu_download -> showDownloadDialog()
R.id.menu_add_bookmark -> { R.id.menu_add_bookmark -> {
val book = ReadBook.book val book = ReadBook.book
val page = ReadBook.curTextChapter?.page(ReadBook.durPageIndex) val page = ReadBook.curTextChapter?.getPage(ReadBook.durPageIndex)
if (book != null && page != null) { if (book != null && page != null) {
val bookmark = book.createBookMark().apply { val bookmark = book.createBookMark().apply {
chapterIndex = ReadBook.durChapterIndex chapterIndex = ReadBook.durChapterIndex
@@ -1106,8 +1106,9 @@ class ReadBookActivity : BaseReadBookActivity(),
launch(IO) { launch(IO) {
if (BaseReadAloudService.isPlay()) { if (BaseReadAloudService.isPlay()) {
ReadBook.curTextChapter?.let { textChapter -> ReadBook.curTextChapter?.let { textChapter ->
val aloudSpanStart = chapterStart - ReadBook.durChapterPos val pageIndex = ReadBook.durPageIndex
textChapter.getPageByReadPos(ReadBook.durChapterPos) val aloudSpanStart = chapterStart - textChapter.getReadLength(pageIndex)
textChapter.getPage(pageIndex)
?.upPageAloudSpan(aloudSpanStart) ?.upPageAloudSpan(aloudSpanStart)
upContent() upContent()
} }
app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt
+2 -2
View File
@@ -12,12 +12,12 @@ data class TextChapter(
val isPay: Boolean, val isPay: Boolean,
) { ) {
fun page(index: Int): TextPage? { fun getPage(index: Int): TextPage? {
return pages.getOrNull(index) return pages.getOrNull(index)
} }
fun getPageByReadPos(readPos: Int): TextPage? { fun getPageByReadPos(readPos: Int): TextPage? {
return page(getPageIndexByCharIndex(readPos)) return getPage(getPageIndexByCharIndex(readPos))
} }
val lastPage: TextPage? get() = pages.lastOrNull() val lastPage: TextPage? get() = pages.lastOrNull()
app/src/main/java/io/legado/app/ui/book/read/page/provider/TextPageFactory.kt
+7 -7
View File
@@ -65,7 +65,7 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
return@with TextPage(text = it).format() return@with TextPage(text = it).format()
} }
currentChapter?.let { currentChapter?.let {
return@with it.page(pageIndex) ?: TextPage(title = it.title).format() return@with it.getPage(pageIndex) ?: TextPage(title = it.title).format()
} }
return TextPage().format() return TextPage().format()
} }
@@ -77,7 +77,7 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
} }
currentChapter?.let { currentChapter?.let {
if (pageIndex < it.pageSize - 1) { if (pageIndex < it.pageSize - 1) {
return@with it.page(pageIndex + 1)?.removePageAloudSpan() return@with it.getPage(pageIndex + 1)?.removePageAloudSpan()
?: TextPage(title = it.title).format() ?: TextPage(title = it.title).format()
} }
} }
@@ -85,7 +85,7 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
return@with TextPage(text = "") return@with TextPage(text = "")
} }
nextChapter?.let { nextChapter?.let {
return@with it.page(0)?.removePageAloudSpan() return@with it.getPage(0)?.removePageAloudSpan()
?: TextPage(title = it.title).format() ?: TextPage(title = it.title).format()
} }
return TextPage().format() return TextPage().format()
@@ -98,7 +98,7 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
} }
if (pageIndex > 0) { if (pageIndex > 0) {
currentChapter?.let { currentChapter?.let {
return@with it.page(pageIndex - 1)?.removePageAloudSpan() return@with it.getPage(pageIndex - 1)?.removePageAloudSpan()
?: TextPage(title = it.title).format() ?: TextPage(title = it.title).format()
} }
} }
@@ -113,15 +113,15 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
get() = with(dataSource) { get() = with(dataSource) {
currentChapter?.let { currentChapter?.let {
if (pageIndex < it.pageSize - 2) { if (pageIndex < it.pageSize - 2) {
return@with it.page(pageIndex + 2)?.removePageAloudSpan() return@with it.getPage(pageIndex + 2)?.removePageAloudSpan()
?: TextPage(title = it.title).format() ?: TextPage(title = it.title).format()
} }
nextChapter?.let { nc -> nextChapter?.let { nc ->
if (pageIndex < it.pageSize - 1) { if (pageIndex < it.pageSize - 1) {
return@with nc.page(0)?.removePageAloudSpan() return@with nc.getPage(0)?.removePageAloudSpan()
?: TextPage(title = nc.title).format() ?: TextPage(title = nc.title).format()
} }
return@with nc.page(1)?.removePageAloudSpan() return@with nc.getPage(1)?.removePageAloudSpan()
?: TextPage(title = nc.title).format() ?: TextPage(title = nc.title).format()
} }