From bbb9fe2c0fa911943f9d0893281b46f36c0520c1 Mon Sep 17 00:00:00 2001
From: jaredtech <hk_rjc@163.com>
Date: Thu, 30 Mar 2023 15:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=98=85=E8=AF=BB=E6=97=B6,?=
 =?UTF-8?q?=E5=A4=9A=E6=8C=87=E8=A7=A6=E6=91=B8=E9=80=A0=E6=88=90=E9=97=AA?=
 =?UTF-8?q?=E7=83=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/ui/book/read/page/ReadView.kt     | 9 ++-------
 .../app/ui/book/read/page/delegate/ScrollPageDelegate.kt | 9 +++++++++
 2 files changed, 11 insertions(+), 7 deletions(-)

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 7ef3f5c84..d3d1db433 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
@@ -182,13 +182,8 @@ class ReadView(context: Context, attrs: AttributeSet) :
         }
 
         //在多点触控时，事件不走ACTION_DOWN分支而产生的特殊事件处理
-        if (event.actionMasked == MotionEvent.ACTION_POINTER_DOWN){
-            //当多个手指同时按下的情况，将最后一个按下的手指的坐标设置为起始坐标，所以只有最后一个手指的滑动事件被处理
-            setStartPoint(event.getX(event.pointerCount - 1), event.getY(event.pointerCount - 1), false)
-        } else if(event.actionMasked == MotionEvent.ACTION_POINTER_UP){
-            //当多个手指同时按下的情况，当抬起一个手指时，起始坐标恢复为第一次按下的手指的坐标
-            setStartPoint(event.x, event.y, false)
-            return true
+        if (event.actionMasked == MotionEvent.ACTION_POINTER_DOWN || event.actionMasked == MotionEvent.ACTION_POINTER_UP){
+            pageDelegate?.onTouch(event)
         }
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
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 dea3f99d1..381991193 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
@@ -33,6 +33,15 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) {
     }
 
     override fun onTouch(event: MotionEvent) {
+        //在多点触控时，事件不走ACTION_DOWN分支而产生的特殊事件处理
+        if (event.actionMasked == MotionEvent.ACTION_POINTER_DOWN){
+            //当多个手指同时按下的情况，将最后一个按下的手指的坐标设置为起始坐标，所以只有最后一个手指的滑动事件被处理
+            readView.setStartPoint(event.getX(event.pointerCount - 1), event.getY(event.pointerCount - 1), false)
+        } else if(event.actionMasked == MotionEvent.ACTION_POINTER_UP){
+            //当多个手指同时按下的情况，当抬起一个手指时，起始坐标恢复为第一次按下的手指的坐标
+            readView.setStartPoint(event.x, event.y, false)
+            return
+        }
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
                 abortAnim()