|
|
@@ -852,8 +852,7 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|
|
*/
|
|
|
override fun onMenuActionFinally() = binding.run {
|
|
|
textActionMenu.dismiss()
|
|
|
- readView.curPage.cancelSelect()
|
|
|
- readView.isTextSelected = false
|
|
|
+ readView.cancelSelect()
|
|
|
}
|
|
|
|
|
|
private fun speak(text: String) {
|
|
|
@@ -958,7 +957,6 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|
|
success: (() -> Unit)?
|
|
|
) {
|
|
|
lifecycleScope.launch {
|
|
|
- binding.readView.cancelSelect()
|
|
|
binding.readView.upContent(relativePosition, resetPageOffset)
|
|
|
if (relativePosition == 0) {
|
|
|
upSeekBarProgress()
|
|
|
@@ -973,7 +971,6 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|
|
resetPageOffset: Boolean,
|
|
|
success: (() -> Unit)?
|
|
|
) = withContext(Main.immediate) {
|
|
|
- binding.readView.cancelSelect()
|
|
|
binding.readView.upContent(relativePosition, resetPageOffset)
|
|
|
if (relativePosition == 0) {
|
|
|
upSeekBarProgress()
|
|
|
@@ -994,6 +991,12 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ override fun cancelSelect() {
|
|
|
+ runOnUiThread {
|
|
|
+ binding.readView.cancelSelect()
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 页面改变
|
|
|
*/
|
|
|
@@ -1184,11 +1187,8 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|
|
isShowingSearchResult = false
|
|
|
binding.searchMenu.invalidate()
|
|
|
binding.searchMenu.invisible()
|
|
|
- binding.readView.isTextSelected = false
|
|
|
- ReadBook.curTextChapter?.clearSearchResult()
|
|
|
- ReadBook.prevTextChapter?.clearSearchResult()
|
|
|
- ReadBook.nextTextChapter?.clearSearchResult()
|
|
|
- binding.readView.curPage.cancelSelect(true)
|
|
|
+ ReadBook.clearSearchResult()
|
|
|
+ binding.readView.cancelSelect(true)
|
|
|
}
|
|
|
}
|
|
|
|