fix remove() crash when have header view

CymChad · Mar 25, 2017 · 9dd7033 · 9dd7033
1 parent f37bd06
commit 9dd7033
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
@@ -449,9 +449,10 @@ public void addData(T data) {
      */
     public void remove(int position) {
         mData.remove(position);
-        notifyItemRemoved(position + getHeaderLayoutCount());
+        int internalPosition = position + getHeaderLayoutCount();
+        notifyItemRemoved(internalPosition);
         compatibilityDataSizeChanged(0);
-        notifyItemRangeChanged(position, mData.size() - position);
+        notifyItemRangeChanged(internalPosition, mData.size() - internalPosition);
     }
 
     /**
@@ -798,7 +799,7 @@ private void bindViewClickListener(final BaseViewHolder baseViewHolder) {
         view.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (getOnItemClickListener() != null&&baseViewHolder!=null) {
+                if (getOnItemClickListener() != null && baseViewHolder != null) {
 
                     getOnItemClickListener().onItemClick(BaseQuickAdapter.this, v, baseViewHolder.getLayoutPosition() - getHeaderLayoutCount());
                 }
@@ -808,7 +809,7 @@ public void onClick(View v) {
         view.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                if (getOnItemLongClickListener() != null&&baseViewHolder!=null) {
+                if (getOnItemLongClickListener() != null && baseViewHolder != null) {
                     return getOnItemLongClickListener().onItemLongClick(BaseQuickAdapter.this, v, baseViewHolder.getLayoutPosition() - getHeaderLayoutCount());
                 }
                 return false;