优化fling

donkingliang · Jul 1, 2021 · c9919b2 · c9919b2
1 parent 310a0bd
commit c9919b2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java b/...croller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveScrollerLayout.java
@@ -633,7 +633,9 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
                     recycleAdjustVelocityTracker();
                     int touchX = ScrollUtils.getRawX(this, ev, actionIndex);
                     int touchY = ScrollUtils.getRawY(this, ev, actionIndex);
-                    boolean canScrollVerticallyChild = ScrollUtils.canScrollVertically(getTouchTarget(touchX, touchY));
+                    View targetView = getTouchTarget(touchX, touchY);
+                    boolean canScrollVerticallyChild = ScrollUtils.canScrollVertically(targetView);
+                    boolean canScrollHorizontallyChild = ScrollUtils.canScrollHorizontally(targetView);
                     if (SCROLL_ORIENTATION != SCROLL_VERTICAL && canScrollVerticallyChild
                             && Math.abs(yVelocity) >= mMinimumVelocity
                             && !ScrollUtils.isHorizontalScroll(this, touchX, touchY)) {
@@ -642,9 +644,11 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
                         ev.setAction(MotionEvent.ACTION_CANCEL);
                     }
 
-                    if (SCROLL_ORIENTATION == SCROLL_NONE && !ScrollUtils.isConsecutiveScrollParent(this)
+                    if (SCROLL_ORIENTATION != SCROLL_VERTICAL && !ScrollUtils.isConsecutiveScrollParent(this)
                             && isIntercept(ev) && Math.abs(yVelocity) >= mMinimumVelocity) {
-                        fling(-mAdjustYVelocity);
+                        if (SCROLL_ORIENTATION == SCROLL_NONE || !canScrollHorizontallyChild){
+                            fling(-mAdjustYVelocity);
+                        }
                     }
                 }
 

diff --git a/...ivescroller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveViewPager2.java b/...ivescroller/src/main/java/com/donkingliang/consecutivescroller/ConsecutiveViewPager2.java
@@ -257,6 +257,16 @@ public void unregisterOnPageChangeCallback(@NonNull ViewPager2.OnPageChangeCallb
         mViewPager2.unregisterOnPageChangeCallback(callback);
     }
 
+    @Override
+    public boolean canScrollHorizontally(int direction) {
+        return mViewPager2.canScrollHorizontally(direction);
+    }
+
+    @Override
+    public boolean canScrollVertically(int direction) {
+        return mViewPager2.canScrollVertically(direction);
+    }
+
     private static class AttachListener implements OnAttachStateChangeListener {
 
         WeakReference<ConsecutiveViewPager2> reference;

diff --git a/consecutivescroller/src/main/java/com/donkingliang/consecutivescroller/ScrollUtils.java b/consecutivescroller/src/main/java/com/donkingliang/consecutivescroller/ScrollUtils.java
@@ -111,6 +111,16 @@ static int getScrollBottomOffset(View view) {
         }
     }
 
+    /**
+     * 是否是可以水平滚动View。(内容可以滚动，或者本身就是个滚动布局)
+     *
+     * @param view
+     * @return
+     */
+    static boolean canScrollHorizontally(View view) {
+        return isConsecutiveScrollerChild(view) && (view.canScrollHorizontally(1) || view.canScrollHorizontally(-1));
+    }
+
     /**
      * 是否是可以垂直滚动View。(内容可以滚动，或者本身就是个滚动布局)
      *