From d2c6c4bdfa56355b6677735eb6e94654343487ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BC=8D=E7=87=8E?= <1229639518@qq.com>
Date: Sat, 11 Jul 2015 13:59:33 +0800
Subject: [PATCH] fix a bug about gesture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

if ((moveUp && canMoveUp) || moveDown) {
      movePos(offsetY);
      return true;
}
当事件传递到子View的时候movePos(offsetY)方法还会起作用。所以当PtrFrameLayout的子View中有ViewPager就会造成手势混乱
---
 .../srain/cube/views/ptr/PtrFrameLayout.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java b/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java
index ef8770b..f689727 100755
--- a/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java
+++ b/ptr-lib/src/in/srain/cube/views/ptr/PtrFrameLayout.java
@@ -67,6 +67,7 @@ public class PtrFrameLayout extends ViewGroup {
     private long mLoadingStartTime = 0;
     private PtrIndicator mPtrIndicator;
     private boolean mHasSendCancelEvent = false;
+    private boolean isCanNotMove=false;
 
     public PtrFrameLayout(Context context) {
         this(context, null);
@@ -261,6 +262,7 @@ public boolean dispatchTouchEvent(MotionEvent e) {
         switch (action) {
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
+                isCanNotMove=false;
                 mPtrIndicator.onRelease();
                 if (mPtrIndicator.hasLeftStartPosition()) {
                     if (DEBUG) {
@@ -278,6 +280,7 @@ public boolean dispatchTouchEvent(MotionEvent e) {
 
             case MotionEvent.ACTION_DOWN:
                 mHasSendCancelEvent = false;
+                isCanNotMove=false;
                 mPtrIndicator.onPressDown(e.getX(), e.getY());
 
                 mScrollChecker.abortIfWorking();
@@ -301,7 +304,8 @@ public boolean dispatchTouchEvent(MotionEvent e) {
                     }
                 }
                 if (mPreventForHorizontal) {
-                    return dispatchTouchEventSupper(e);
+                    isCanNotMove=dispatchTouchEventSupper(e)
+                    return isCanNotMove;
                 }
 
                 boolean moveDown = offsetY > 0;
@@ -312,13 +316,17 @@ public boolean dispatchTouchEvent(MotionEvent e) {
                     boolean canMoveDown = mPtrHandler != null && mPtrHandler.checkCanDoRefresh(this, mContent, mHeaderView);
                     PtrCLog.v(LOG_TAG, "ACTION_MOVE: offsetY:%s, currentPos: %s, moveUp: %s, canMoveUp: %s, moveDown: %s: canMoveDown: %s", offsetY, mPtrIndicator.getCurrentPosY(), moveUp, canMoveUp, moveDown, canMoveDown);
                 }
-
+                
                 // disable move when header not reach top
                 if (moveDown && mPtrHandler != null && !mPtrHandler.checkCanDoRefresh(this, mContent, mHeaderView)) {
-                    return dispatchTouchEventSupper(e);
+                    isCanNotMove=dispatchTouchEventSupper(e)
+                    return isCanNotMove;
                 }
-
-                if ((moveUp && canMoveUp) || moveDown) {
+                if(Math.abs(offsetX)>Math.abs(offsetY)){
+                    isCanNotMove =dispatchTouchEventSupper(e);
+                    return isCanNotMove;
+                }
+                if (((moveUp && canMoveUp) || moveDown)&&!isCanNotMove) {
                     movePos(offsetY);
                     return true;
                 }