Merge pull request CymChad#1381 from FrankKwok/master

fix CymChad#1379

Author: CymChad

library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java

@@ -1001,8 +1001,14 @@ protected K createBaseViewHolder(View view) {
             z = getInstancedGenericKClass(temp);
             temp = temp.getSuperclass();
         }
-        K k = createGenericKInstance(z, view);
-        return null != k ? k : (K) new BaseViewHolder(view);
+        K k;
+        // 泛型擦除会导致z为null
+        if (z == null) {
+            k = (K) new BaseViewHolder(view);
+        } else {
+            k = createGenericKInstance(z, view);
+        }
+        return k != null ? k : (K) new BaseViewHolder(view);
     }
 
     /**

library/src/main/java/com/chad/library/adapter/base/callback/ItemDragAndSwipeCallback.java

@@ -7,6 +7,7 @@
 
 import com.chad.library.R;
 import com.chad.library.adapter.base.BaseItemDraggableAdapter;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 
 /**
  * Created by luoxw on 2016/6/20.
@@ -15,13 +16,13 @@ public class ItemDragAndSwipeCallback extends ItemTouchHelper.Callback {
 
 //    private static final String TAG = ItemDragAndSwipeCallback.class.getSimpleName();
 
-    BaseItemDraggableAdapter mAdapter;
+    private BaseItemDraggableAdapter mAdapter;
 
-    float mMoveThreshold = 0.1f;
-    float mSwipeThreshold = 0.7f;
+    private float mMoveThreshold = 0.1f;
+    private float mSwipeThreshold = 0.7f;
 
-    int mDragMoveFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
-    int mSwipeMoveFlags = ItemTouchHelper.END;
+    private int mDragMoveFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+    private int mSwipeMoveFlags = ItemTouchHelper.END;
 
     public ItemDragAndSwipeCallback(BaseItemDraggableAdapter adapter) {
         mAdapter = adapter;
@@ -81,11 +82,7 @@ public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder v
 
     @Override
     public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
-        if (source.getItemViewType() != target.getItemViewType()) {
-            return false;
-        } else {
-            return true;
-        }
+        return source.getItemViewType() == target.getItemViewType();
     }
 
     @Override
@@ -188,11 +185,7 @@ public void onChildDrawOver(Canvas c, RecyclerView recyclerView, RecyclerView.Vi
 
     private boolean isViewCreateByAdapter(RecyclerView.ViewHolder viewHolder) {
         int type = viewHolder.getItemViewType();
-        if (type == mAdapter.HEADER_VIEW || type == mAdapter.LOADING_VIEW
-                || type == mAdapter.FOOTER_VIEW || type == mAdapter.EMPTY_VIEW) {
-            return true;
-        }
-        return false;
-
+        return type == BaseQuickAdapter.HEADER_VIEW || type == BaseQuickAdapter.LOADING_VIEW
+                || type == BaseQuickAdapter.FOOTER_VIEW || type == BaseQuickAdapter.EMPTY_VIEW;
     }
 }