From b57a4e77284d8396b71c6644638040f4f8aa7634 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Fri, 29 Sep 2023 13:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/book/read/ReadBookActivity.kt | 6 ++++++ .../main/java/io/legado/app/ui/book/read/page/ReadView.kt | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 48f1aab97..615973162 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -538,6 +538,7 @@ class ReadBookActivity : BaseReadBookActivity(), when { isPrevKey(keyCode) -> { if (keyCode != KeyEvent.KEYCODE_UNKNOWN) { + binding.readView.cancelSelect() binding.readView.pageDelegate?.keyTurnPage(PageDirection.PREV) return true } @@ -545,6 +546,7 @@ class ReadBookActivity : BaseReadBookActivity(), isNextKey(keyCode) -> { if (keyCode != KeyEvent.KEYCODE_UNKNOWN) { + binding.readView.cancelSelect() binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT) return true } @@ -563,16 +565,19 @@ class ReadBookActivity : BaseReadBookActivity(), } keyCode == KeyEvent.KEYCODE_PAGE_UP -> { + binding.readView.cancelSelect() binding.readView.pageDelegate?.keyTurnPage(PageDirection.PREV) return true } keyCode == KeyEvent.KEYCODE_PAGE_DOWN -> { + binding.readView.cancelSelect() binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT) return true } keyCode == KeyEvent.KEYCODE_SPACE -> { + binding.readView.cancelSelect() binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT) return true } @@ -786,6 +791,7 @@ class ReadBookActivity : BaseReadBookActivity(), if (getPrefBoolean("volumeKeyPageOnPlay") || !BaseReadAloudService.isPlay() ) { + binding.readView.cancelSelect() binding.readView.pageDelegate?.isCancel = false binding.readView.pageDelegate?.keyTurnPage(direction) return true diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt index ba5bd32ef..dc7496fa9 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt @@ -257,6 +257,13 @@ class ReadView(context: Context, attrs: AttributeSet) : return true } + fun cancelSelect() { + if (isTextSelected) { + curPage.cancelSelect() + isTextSelected = false + } + } + /** * 更新状态栏 */