From c43ed2c57afcce1822862a2103cce7fc6a575b1c Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Mon, 11 Mar 2024 23:34:15 +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/page/ContentTextView.kt | 2 +- app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt | 4 ++++ app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt | 4 ++++ .../app/ui/book/read/page/delegate/ScrollPageDelegate.kt | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt index f66ac0f61..cc0414f83 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt @@ -47,7 +47,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at var textPage: TextPage = TextPage() private set var isMainView = false - private var longScreenshot = false + var longScreenshot = false var reverseStartCursor = false var reverseEndCursor = false diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt index b59e41d61..74af97cbc 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt @@ -451,6 +451,10 @@ class PageView(context: Context) : FrameLayout(context) { return binding.contentTextView.reverseEndCursor } + fun isLongScreenShot(): Boolean { + return binding.contentTextView.longScreenshot + } + fun resetReverseCursor() { binding.contentTextView.resetReverseCursor() } 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 e676cf84f..2361aecbe 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 @@ -668,6 +668,10 @@ class ReadView(context: Context, attrs: AttributeSet) : curPage.submitRenderTask() } + fun isLongScreenShot(): Boolean { + return curPage.isLongScreenShot() + } + override fun onLayoutPageCompleted(index: Int, page: TextPage) { upProgressThrottle.invoke() } diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt index 2d32b1c92..5239e5f87 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt @@ -78,7 +78,7 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) { //多点触控时即最后按下的手指产生的事件点 val pointX = event.getX(event.pointerCount - 1) val pointY = event.getY(event.pointerCount - 1) - if (isMoved) { + if (isMoved || readView.isLongScreenShot()) { readView.setTouchPoint(pointX, pointY, false) } if (!isMoved) {