From 77281b945f5c982f9795609bc36fc0090338032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Sat, 4 Jul 2020 14:51:05 +0800
Subject: [PATCH] fix scroll end callback time

---
 .../java/pub/doric/widget/HVScrollView.java     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/doric-android/doric/src/main/java/pub/doric/widget/HVScrollView.java b/doric-android/doric/src/main/java/pub/doric/widget/HVScrollView.java
index 79abe2f3..940927ea 100644
--- a/doric-android/doric/src/main/java/pub/doric/widget/HVScrollView.java
+++ b/doric-android/doric/src/main/java/pub/doric/widget/HVScrollView.java
@@ -198,6 +198,7 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
     private float mVerticalScrollFactor;
 
     private OnScrollChangeListener mOnScrollChangeListener;
+    private boolean mInTouch = false;
 
     public HVScrollView(Context context) {
         this(context, null);
@@ -692,9 +693,6 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
             return;
         }
         mScrollState = state;
-        if (state == SCROLL_STATE_IDLE && mOnScrollChangeListener != null) {
-            mOnScrollChangeListener.onScrollEnd(this, getScrollX(), getScrollY());
-        }
     }
 
     private void cancelTouch() {
@@ -895,7 +893,7 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
 
         switch (actionMasked) {
             case MotionEvent.ACTION_DOWN: {
-
+                mInTouch = true;
                 /*
                  * If being flinged and user touches, stop the fling. isFinished
                  * will be false if being flinged.
@@ -920,6 +918,8 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
                 break;
             }
             case MotionEvent.ACTION_MOVE:
+                mInTouch = true;
+
                 final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
                 if (activePointerIndex == -1) {
                     Log.e(TAG, "Invalid pointerId=" + mActivePointerId + " in onTouchEvent");
@@ -1041,6 +1041,8 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
                 }
                 break;
             case MotionEvent.ACTION_UP:
+                mInTouch = false;
+
                 final VelocityTracker velocityTracker = mVelocityTracker;
                 velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
 
@@ -1058,6 +1060,8 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
                 resetTouch();
                 break;
             case MotionEvent.ACTION_CANCEL:
+                mInTouch = false;
+
                 if (mScrollState == SCROLL_STATE_DRAGGING) {
                     if (mScroller.springBack(getScrollX(), getScrollY(), 0, getScrollRangeX(), 0, getScrollRangeY())) {
                         ViewCompat.postInvalidateOnAnimation(this);
@@ -1998,6 +2002,11 @@ public class HVScrollView extends FrameLayout implements NestedScrollingParent,
                 ViewCompat.postInvalidateOnAnimation(this);
             }
         }
+        if (mScroller.isFinished() && !mInTouch) {
+            if (mOnScrollChangeListener != null) {
+                mOnScrollChangeListener.onScrollEnd(HVScrollView.this, getScrollX(), getScrollY());
+            }
+        }
     }
 
     /**