先提交

Author: wensefu

library/src/main/java/com/beyondsw/lib/widget/StackCardsView.java

@@ -310,8 +310,20 @@ void tryAppendChild() {
         }
     }
 
-    void updateChildrenPosition(float progress, int startIndex) {
+    void onChildScrolling(float progress, View view) {
+        int index = indexOfChild(view);
+        if (index == getChildCount() - 1) {
+            return;
+        }
+        updateChildrenPosition(progress, getChildAt(index + 1));
+    }
+
+    void updateChildrenPosition(float progress, View startView) {
         final int cnt = getChildCount();
+        int startIndex = indexOfChild(startView);
+        if (startIndex == -1) {
+            return;
+        }
         float oriScale;
         float oriAlpha;
         float oriTranslationY;
@@ -321,10 +333,6 @@ void updateChildrenPosition(float progress, int startIndex) {
         float progressScale;
         for (int i = startIndex; i < cnt; i++) {
             View child = getChildAt(i);
-            if (child == null) {
-                log(TAG, "updateChildrenPosition: err,child=null");
-                return;
-            }
             int oriIndex = Math.min(mScaleArray.length - 1, i - startIndex + 1);
             if (child.getVisibility() != View.GONE) {
                 if (mScaleArray != null) {

library/src/main/java/com/beyondsw/lib/widget/SwipeTouchHelper.java

@@ -34,6 +34,7 @@ public class SwipeTouchHelper implements ISwipeTouchHelper {
     private StackCardsView mSwipeView;
     private float mCurProgress;
     private ValueAnimator mSmoothUpdater;
+    private ManualDisappearUpdateListener mManualUpdateListener;
     private float mLastX;
     private float mLastY;
     private float mInitDownX;
@@ -247,6 +248,10 @@ private void performDrag(float dx, float dy) {
         if (mSmoothUpdater != null && mSmoothUpdater.isRunning()) {
             mSmoothUpdater.end();
         }
+        if (mManualUpdateListener != null) {
+            mManualUpdateListener.end();
+            mManualUpdateListener = null;
+        }
         mTouchChild.setX(mTouchChild.getX() + dx);
         mTouchChild.setY(mTouchChild.getY() + dy);
         final StackCardsView.LayoutParams lp = (StackCardsView.LayoutParams) mTouchChild.getLayoutParams();
@@ -286,6 +291,13 @@ private void doManualDisappear(final int direction) {
         if (mTouchChild == null) {
             return;
         }
+        if (mSmoothUpdater != null && mSmoothUpdater.isRunning()) {
+            mSmoothUpdater.end();
+        }
+        if (mManualUpdateListener != null) {
+            mManualUpdateListener.end();
+            mManualUpdateListener = null;
+        }
         mDisappearingCnt++;
         final View disappearView = mTouchChild;
         mSwipeView.tryAppendChild();
@@ -337,16 +349,34 @@ public void onAnimationStart(Animator animation) {
                     mSwipeView.onCoverStatusChanged(false);
                 }
             });
-            animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    onCoverScrolled(disappearView);
-                }
-            });
+            mManualUpdateListener = new ManualDisappearUpdateListener(disappearView);
+            animator.addUpdateListener(mManualUpdateListener);
             animator.start();
         }
     }
 
+    private class ManualDisappearUpdateListener implements ValueAnimator.AnimatorUpdateListener{
+
+        View disappearView;
+        boolean isCanceled;
+
+        ManualDisappearUpdateListener(View disappearView) {
+            this.disappearView = disappearView;
+        }
+
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            if (!isCanceled) {
+                onCoverScrolled(disappearView);
+            }
+        }
+
+        void end(){
+            isCanceled = true;
+            mSwipeView.onChildScrolling(1, disappearView);
+        }
+    }
+
     private void doSlowDisappear() {
         if (mTouchChild == null) {
             return;
@@ -453,7 +483,7 @@ private void smoothUpdatePosition(final View startView) {
         mSmoothUpdater.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
             @Override
             public void onAnimationUpdate(ValueAnimator animation) {
-                mSwipeView.updateChildrenPosition((float) animation.getAnimatedValue(), mSwipeView.indexOfChild(startView));
+                mSwipeView.updateChildrenPosition((float) animation.getAnimatedValue(), startView);
             }
         });
         mSmoothUpdater.start();
@@ -478,6 +508,10 @@ private boolean doFastDisappear(float vx, float vy) {
 
         mSwipeView.tryAppendChild();
         updateTouchChild();
+        if (mManualUpdateListener != null) {
+            mManualUpdateListener.end();
+            mManualUpdateListener = null;
+        }
         smoothUpdatePosition(mTouchChild);
 
         float dx = disappearView.getX() - initX;
@@ -571,13 +605,12 @@ private void onCoverScrolled(View movingView) {
         float dy = movingView.getY() - mChildInitY;
         double distance = Math.sqrt(dx * dx + dy * dy);
         float dismiss_distance = mSwipeView.getDismissDistance();
-        int index = mSwipeView.indexOfChild(movingView) + 1;
         if (distance >= dismiss_distance) {
-            mSwipeView.updateChildrenPosition(1, index);
+            mSwipeView.onChildScrolling(1, movingView);
             mCurProgress = 1;
         } else {
             final float progress = (float) distance / dismiss_distance;
-            mSwipeView.updateChildrenPosition(progress, index);
+            mSwipeView.onChildScrolling(progress, movingView);
             mCurProgress = progress;
         }
     }