This commit is contained in:
Horis
2023-09-29 13:31:04 +08:00
parent 886cecb280
commit b5993619a9
2 changed files with 13 additions and 0 deletions
@@ -538,6 +538,7 @@ class ReadBookActivity : BaseReadBookActivity(),
when { when {
isPrevKey(keyCode) -> { isPrevKey(keyCode) -> {
if (keyCode != KeyEvent.KEYCODE_UNKNOWN) { if (keyCode != KeyEvent.KEYCODE_UNKNOWN) {
binding.readView.cancelSelect()
binding.readView.pageDelegate?.keyTurnPage(PageDirection.PREV) binding.readView.pageDelegate?.keyTurnPage(PageDirection.PREV)
return true return true
} }
@@ -545,6 +546,7 @@ class ReadBookActivity : BaseReadBookActivity(),
isNextKey(keyCode) -> { isNextKey(keyCode) -> {
if (keyCode != KeyEvent.KEYCODE_UNKNOWN) { if (keyCode != KeyEvent.KEYCODE_UNKNOWN) {
binding.readView.cancelSelect()
binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT) binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT)
return true return true
} }
@@ -563,16 +565,19 @@ class ReadBookActivity : BaseReadBookActivity(),
} }
keyCode == KeyEvent.KEYCODE_PAGE_UP -> { keyCode == KeyEvent.KEYCODE_PAGE_UP -> {
binding.readView.cancelSelect()
binding.readView.pageDelegate?.keyTurnPage(PageDirection.PREV) binding.readView.pageDelegate?.keyTurnPage(PageDirection.PREV)
return true return true
} }
keyCode == KeyEvent.KEYCODE_PAGE_DOWN -> { keyCode == KeyEvent.KEYCODE_PAGE_DOWN -> {
binding.readView.cancelSelect()
binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT) binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT)
return true return true
} }
keyCode == KeyEvent.KEYCODE_SPACE -> { keyCode == KeyEvent.KEYCODE_SPACE -> {
binding.readView.cancelSelect()
binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT) binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT)
return true return true
} }
@@ -786,6 +791,7 @@ class ReadBookActivity : BaseReadBookActivity(),
if (getPrefBoolean("volumeKeyPageOnPlay") if (getPrefBoolean("volumeKeyPageOnPlay")
|| !BaseReadAloudService.isPlay() || !BaseReadAloudService.isPlay()
) { ) {
binding.readView.cancelSelect()
binding.readView.pageDelegate?.isCancel = false binding.readView.pageDelegate?.isCancel = false
binding.readView.pageDelegate?.keyTurnPage(direction) binding.readView.pageDelegate?.keyTurnPage(direction)
return true return true
@@ -257,6 +257,13 @@ class ReadView(context: Context, attrs: AttributeSet) :
return true return true
} }
fun cancelSelect() {
if (isTextSelected) {
curPage.cancelSelect()
isTextSelected = false
}
}
/** /**
* 更新状态栏 * 更新状态栏
*/ */