pull/811/head
gedoor 4 years ago
parent cfc9726a43
commit ebb760aeb8
  1. 17
      app/src/main/java/io/legado/app/service/help/ReadBook.kt
  2. 23
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

@ -183,9 +183,11 @@ object ReadBook {
}
}
fun skipToPage(index: Int) {
fun skipToPage(index: Int, success: (() -> Unit)? = null) {
durChapterPos = curTextChapter?.getReadLength(index) ?: index
callBack?.upContent()
callBack?.upContent() {
success?.invoke()
}
curPageChanged()
saveRead()
}
@ -478,10 +480,19 @@ object ReadBook {
interface CallBack {
fun loadChapterList(book: Book)
fun upContent(relativePosition: Int = 0, resetPageOffset: Boolean = true)
fun upContent(
relativePosition: Int = 0,
resetPageOffset: Boolean = true,
success: (() -> Unit)? = null
)
fun upView()
fun pageChanged()
fun contentLoadFinish()
fun upPageAnim()
}

@ -51,10 +51,8 @@ import io.legado.app.ui.widget.dialog.TextDialog
import io.legado.app.utils.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.startActivityForResult
import org.jetbrains.anko.toast
@ -531,13 +529,18 @@ class ReadBookActivity : ReadBookBaseActivity(),
/**
* 更新内容
*/
override fun upContent(relativePosition: Int, resetPageOffset: Boolean) {
autoPageProgress = 0
override fun upContent(
relativePosition: Int,
resetPageOffset: Boolean,
success: (() -> Unit)?
) {
launch {
autoPageProgress = 0
binding.readView.upContent(relativePosition, resetPageOffset)
binding.readMenu.setSeekPage(ReadBook.durPageIndex())
}
loadStates = false
success?.invoke()
}
}
/**
@ -807,18 +810,14 @@ class ReadBookActivity : ReadBookBaseActivity(),
private fun skipToSearch(index: Int, indexWithinChapter: Int) {
viewModel.openChapter(index) {
launch(IO) {
val pages = ReadBook.curTextChapter?.pages ?: return@launch
val pages = ReadBook.curTextChapter?.pages ?: return@openChapter
val positions = ReadBook.searchResultPositions(
pages,
indexWithinChapter,
viewModel.searchContentQuery
)
while (ReadBook.durPageIndex() != positions[0]) {
delay(100L)
ReadBook.skipToPage(positions[0])
}
withContext(Main) {
ReadBook.skipToPage(positions[0]) {
launch {
binding.readView.curPage.selectStartMoveIndex(0, positions[1], positions[2])
delay(20L)
when (positions[3]) {

Loading…
Cancel
Save