mirror of
https://github.com/gedoor/legado.git
synced 2025-08-10 00:52:30 +00:00
优化
This commit is contained in:
@@ -167,6 +167,7 @@ class ReadBookActivity : BaseReadBookActivity(),
|
||||
private val menuLayoutIsVisible get() = bottomDialog > 0 || binding.readMenu.isVisible
|
||||
private val nextPageRunnable by lazy { Runnable { mouseWheelPage(PageDirection.NEXT) } }
|
||||
private val prevPageRunnable by lazy { Runnable { mouseWheelPage(PageDirection.PREV) } }
|
||||
private var isFirstResume = true
|
||||
|
||||
//恢复跳转前进度对话框的交互结果
|
||||
private var confirmRestoreProcess: Boolean? = null
|
||||
@@ -180,7 +181,6 @@ class ReadBookActivity : BaseReadBookActivity(),
|
||||
binding.cursorRight.setOnTouchListener(this)
|
||||
window.setBackgroundDrawable(null)
|
||||
upScreenTimeOut()
|
||||
ReadBook.exit()
|
||||
ReadBook.callBack = this
|
||||
}
|
||||
|
||||
@@ -204,14 +204,23 @@ class ReadBookActivity : BaseReadBookActivity(),
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
ReadBook.readStartTime = System.currentTimeMillis()
|
||||
//web端阅读时,app处于阅读界面,本地记录会覆盖web保存的进度,在此处恢复
|
||||
ReadBook.webBookProgress?.let {
|
||||
ReadBook.setProgress(it)
|
||||
ReadBook.webBookProgress = null
|
||||
val bookUrl = intent.getStringExtra("bookUrl")
|
||||
if (!isFirstResume && ReadBook.book?.bookUrl != bookUrl) {
|
||||
ReadBook.callBack = this
|
||||
viewModel.initData(intent)
|
||||
} else {
|
||||
//web端阅读时,app处于阅读界面,本地记录会覆盖web保存的进度,在此处恢复
|
||||
ReadBook.webBookProgress?.let {
|
||||
ReadBook.setProgress(it)
|
||||
ReadBook.webBookProgress = null
|
||||
}
|
||||
}
|
||||
upSystemUiVisibility()
|
||||
registerReceiver(timeBatteryReceiver, timeBatteryReceiver.filter)
|
||||
binding.readView.upTime()
|
||||
if (isFirstResume) {
|
||||
isFirstResume = false
|
||||
}
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
@@ -1031,8 +1040,8 @@ class ReadBookActivity : BaseReadBookActivity(),
|
||||
confirmRestoreProcess = false
|
||||
}
|
||||
onCancelled {
|
||||
ReadBook.lastBookPress = null
|
||||
confirmRestoreProcess = false
|
||||
ReadBook.lastBookPress = null
|
||||
confirmRestoreProcess = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user