修复滑动冲突问题

Author: CNCoderX

README.md

@@ -6,7 +6,7 @@
 
 ## 添加依赖
 ```compile
-compile 'com.cncoderx.wheelview:library:1.2.6'
+compile 'com.cncoderx.wheelview:library:1.2.7'
 ```
 ## 使用方法
 #### 在xml文件中添加

library/src/main/java/com/cncoderx/wheelview/WheelScroller.java

@@ -39,7 +39,8 @@ public void computeScroll() {
 
     private int currentIndex = -1;
 
-    private void doScroll(int distance) {
+    private boolean doScroll(int distance) {
+        int scrollOffset = mScrollOffset;
         mScrollOffset += distance;
         if (!mWheelView.isCyclic()) {
             // 限制滚动边界
@@ -50,7 +51,11 @@ private void doScroll(int distance) {
                 mScrollOffset = maxOffset;
             }
         }
-        notifyWheelChangedListener();
+        if (mScrollOffset != scrollOffset) {
+            notifyWheelChangedListener();
+            return true;
+        }
+        return false;
     }
 
     void notifyWheelChangedListener() {
@@ -91,8 +96,9 @@ public void setCurrentIndex(int index, boolean animated) {
             startScroll(0, mScrollOffset, 0, distance, JUSTIFY_DURATION);
             mWheelView.invalidate();
         } else {
-            doScroll(distance);
-            mWheelView.invalidate();
+            if (doScroll(distance)) {
+                mWheelView.invalidate();
+            }
         }
     }
 
@@ -147,13 +153,17 @@ public boolean onTouchEvent(MotionEvent event) {
             case MotionEvent.ACTION_DOWN:
                 lastTouchY = event.getY();
                 forceFinished(true);
+                mWheelView.getParent().requestDisallowInterceptTouchEvent(true);
                 break;
             case MotionEvent.ACTION_MOVE:
                 float touchY = event.getY();
                 int deltaY = (int) (touchY - lastTouchY);
                 if (deltaY != 0) {
-                    doScroll(-deltaY);
-                    mWheelView.invalidate();
+                    if (doScroll(-deltaY)) {
+                        mWheelView.invalidate();
+                    } else {
+                        mWheelView.getParent().requestDisallowInterceptTouchEvent(false);
+                    }
                 }
                 lastTouchY = touchY;
                 break;