fix: 修复一些bug

Author: XiandengWang

README.md

@@ -17,8 +17,37 @@
 	        compile 'com.github.HalfStackDeveloper:SwipeCardRecyclerView:v1.0.0'
 	}
 
+### 使用 (参见demo)
+**1.RecyclerView设置**
+
+	mRecyclerView = (SwipeCardRecyclerView) findViewById(R.id.recyclerView);
+	mRecyclerView.setLayoutManager(new SwipeCardLayoutManager());
+	
+	mAdapter = new MyAdapter(this, list);
+	mRecyclerView.setAdapter(mAdapter);
+	
+**2.创建继承自SwipeCardAdapter的adapter**
+
+	class MyAdapter extends SwipeCardAdapter
+
 ### 具体细节可移步[《如何利用RecyclerView打造炫酷滑动卡片》](http://www.jianshu.com/p/7977006d2d6a)，欢迎大家fork AND star！
 
 ### 动画效果
+![](http://od35ecbnl.bkt.clouddn.com/swipecard.gif)
+
+### 开源协议
+
+	Copyright （C）2016, 汪先登
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
 
-![](http://od35ecbnl.bkt.clouddn.com/swipecard.gif)

demo/build.gradle

@@ -26,5 +26,5 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:24.2.0'
     testCompile 'junit:junit:4.12'
-    compile 'com.github.HalfStackDeveloper:SwipeCardRecyclerView:v1.0.0'
+    compile project(path: ':swipecardrecyclerview')
 }

demo/src/main/java/com/wangxiandeng/demo/MainActivity.java

@@ -5,7 +5,6 @@
 import android.widget.Toast;
 
 import com.wangxiandeng.swipecardrecyclerview.ItemRemovedListener;
-import com.wangxiandeng.swipecardrecyclerview.SwipeCardAdapter;
 import com.wangxiandeng.swipecardrecyclerview.SwipeCardLayoutManager;
 import com.wangxiandeng.swipecardrecyclerview.SwipeCardRecyclerView;
 
@@ -14,7 +13,7 @@
 
 public class MainActivity extends AppCompatActivity {
     private SwipeCardRecyclerView mRecyclerView;
-    private SwipeCardAdapter mAdapter;
+    private MyAdapter mAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
         for (int i = 0; i < 10; i++) {
             list.add(String.valueOf(i));
         }
-        mAdapter = new SwipeCardAdapter(this, list);
+        mAdapter = new MyAdapter(this, list);
         mRecyclerView.setAdapter(mAdapter);
         mRecyclerView.setRemovedListener(new ItemRemovedListener() {
             @Override

demo/src/main/java/com/wangxiandeng/demo/MyAdapter.java

@@ -0,0 +1,50 @@
+package com.wangxiandeng.demo;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.wangxiandeng.swipecardrecyclerview.SwipeCardAdapter;
+
+import java.util.List;
+
+/**
+ * Created by xingzhu on 2016/11/15.
+ */
+
+public class MyAdapter extends SwipeCardAdapter<MyAdapter.MyHolder> {
+    private Context mContext;
+
+    public MyAdapter(Context context, List<String> list) {
+        super(list);
+        mContext = context;
+    }
+
+
+    @Override
+    public MyHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(mContext).inflate(com.wangxiandeng.swipecardrecyclerview.R.layout.layout_item, parent, false);
+        return new MyHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MyHolder holder, int position) {
+        holder.setData((String) mList.get(position));
+    }
+
+    class MyHolder extends RecyclerView.ViewHolder {
+        private TextView mTextView;
+
+        public MyHolder(View itemView) {
+            super(itemView);
+            mTextView = (TextView) itemView.findViewById(com.wangxiandeng.swipecardrecyclerview.R.id.text);
+        }
+
+        public void setData(String text) {
+            mTextView.setText(text);
+        }
+    }
+}

swipecardrecyclerview/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 19
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"

swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardAdapter.java

@@ -1,45 +1,26 @@
 package com.wangxiandeng.swipecardrecyclerview;
 
-import android.content.Context;
 import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 
 import java.util.List;
 
 /**
  * Created by WangXiandeng on 2016/11/3.
  */
 
-public class SwipeCardAdapter extends RecyclerView.Adapter<SwipeCardAdapter.SwipeCardHolder> {
-    private Context mContext;
-    private List<String> mList;
+public abstract class SwipeCardAdapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> {
+    protected List mList;
 
-    public SwipeCardAdapter(Context context, List<String> list) {
-        mContext = context;
+    public SwipeCardAdapter(List list) {
         mList = list;
     }
 
-
-    @Override
-    public SwipeCardHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.layout_item, parent, false);
-        return new SwipeCardHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(SwipeCardHolder holder, int position) {
-        holder.setData(mList.get(position));
-    }
-
     /**
      * 删除最顶部Item
      */
 
-    public void  delTopItem(){
-        int position=getItemCount()-1;
+    public void delTopItem() {
+        int position = getItemCount() - 1;
         mList.remove(position);
         notifyItemRemoved(position);
     }
@@ -48,17 +29,4 @@ public void  delTopItem(){
     public int getItemCount() {
         return mList.size();
     }
-
-    class SwipeCardHolder extends RecyclerView.ViewHolder {
-        private TextView mTextView;
-
-        public SwipeCardHolder(View itemView) {
-            super(itemView);
-            mTextView = (TextView) itemView.findViewById(R.id.text);
-        }
-
-        public void setData(String text) {
-            mTextView.setText(text);
-        }
-    }
 }

swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardRecyclerView.java

@@ -12,11 +12,16 @@
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewPropertyAnimator;
+import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.OvershootInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Created by WangXiandeng on 2016/11/3.
  */
@@ -25,6 +30,9 @@ public class SwipeCardRecyclerView extends RecyclerView {
     private float mTopViewX;
     private float mTopViewY;
 
+    private float mTopViewOffsetX = 0;
+    private float mTopViewOffsetY = 0;
+
     private float mTouchDownX;
     private float mTouchDownY;
 
@@ -36,6 +44,9 @@ public class SwipeCardRecyclerView extends RecyclerView {
     private int[] mDecorViewLocation = new int[2];
 
 
+    private Map<View, Animator> mAnimatorMap;
+
+
     public SwipeCardRecyclerView(Context context) {
         super(context);
         initView();
@@ -54,6 +65,7 @@ public SwipeCardRecyclerView(Context context, @Nullable AttributeSet attrs, int
     private void initView() {
         mDecorView = (FrameLayout) ((Activity) getContext()).getWindow().getDecorView();
         mDecorView.getLocationOnScreen(mDecorViewLocation);
+        mAnimatorMap = new HashMap<>();
     }
 
     public void setRemovedListener(ItemRemovedListener listener) {
@@ -70,16 +82,25 @@ public boolean onTouchEvent(MotionEvent e) {
         float touchY = e.getY();
         switch (e.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                mTopViewX = topView.getX();
-                mTopViewY = topView.getY();
+                if (mAnimatorMap.containsKey(topView)) {
+                    mAnimatorMap.get(topView).cancel();
+                    mAnimatorMap.remove(topView);
+                    mTopViewOffsetX = topView.getX();
+                    mTopViewOffsetY = topView.getY();
+                } else {
+                    mTopViewX = topView.getX();
+                    mTopViewY = topView.getY();
+                    mTopViewOffsetX = 0;
+                    mTopViewOffsetY = 0;
+                }
                 mTouchDownX = touchX;
                 mTouchDownY = touchY;
                 break;
             case MotionEvent.ACTION_MOVE:
                 float dx = touchX - mTouchDownX;
                 float dy = touchY - mTouchDownY;
-                topView.setX(mTopViewX + dx);
-                topView.setY(mTopViewY + dy);
+                topView.setX(mTopViewX + dx + mTopViewOffsetX);
+                topView.setY(mTopViewY + dy + mTopViewOffsetY);
                 updateNextItem(Math.abs(topView.getX() - mTopViewX) * 0.2 / mBorder + 0.8);
                 break;
             case MotionEvent.ACTION_UP:
@@ -130,7 +151,7 @@ private void touchUp(final View view) {
             mRemovedListener.onLeftRemoved();
         }
         View animView = view;
-        TimeInterpolator interpolator = null;
+        TimeInterpolator interpolator;
         if (del) {
             animView = getMirrorView(view);
             float offsetX = getX() - mDecorView.getX();
@@ -150,6 +171,9 @@ private void touchUp(final View view) {
                 .setListener(new Animator.AnimatorListener() {
                     @Override
                     public void onAnimationStart(Animator animation) {
+                        if (!finalDel) {
+                            mAnimatorMap.put(finalAnimView, animation);
+                        }
                     }
 
                     @Override
@@ -160,6 +184,8 @@ public void onAnimationEnd(Animator animation) {
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
+                        } else {
+                            mAnimatorMap.remove(finalAnimView);
                         }
                     }
 
@@ -231,5 +257,4 @@ private ImageView getMirrorView(View view) {
         mDecorView.addView(mirrorView, params);
         return mirrorView;
     }
-
 }