Merge remote-tracking branch 'origin/master'

CymChad · Jul 27, 2016 · 85413f4 · 85413f4
2 parents 3e319fe + ca4bc59
commit 85413f4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/README-cn.md b/README-cn.md
@@ -37,7 +37,7 @@
 然后在dependencies添加:
 ```
 	dependencies {
-	        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.9.3'
+	        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.9.7'
 	}
 ```
 

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ allprojects {
 Add the dependency
 ```groovy
 dependencies {
-        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.9.3'
+        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.9.7'
 }
 ```
 

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java
@@ -24,6 +24,8 @@ public class PullToRefreshUseActivity extends Activity implements BaseQuickAdapt
     private QuickAdapter mQuickAdapter;
     private SwipeRefreshLayout mSwipeRefreshLayout;
 
+    private View notLoadingView;
+
     private static final int TOTAL_COUNTER = 18;
 
     private static final int PAGE_SIZE = 6;
@@ -67,8 +69,10 @@ public void onLoadMoreRequested() {
             public void run() {
                 if (mCurrentCounter >= TOTAL_COUNTER) {
                     mQuickAdapter.notifyDataChangedAfterLoadMore(false);
-                    View view = getLayoutInflater().inflate(R.layout.not_loading, (ViewGroup) mRecyclerView.getParent(), false);
-                    mQuickAdapter.addFooterView(view);
+                    if (notLoadingView == null) {
+                        notLoadingView = getLayoutInflater().inflate(R.layout.not_loading, (ViewGroup) mRecyclerView.getParent(), false);
+                    }
+                    mQuickAdapter.addFooterView(notLoadingView);
                 } else {
                     new Handler().postDelayed(new Runnable() {
                         @Override
@@ -80,18 +84,17 @@ public void run() {
                 }
             }
 
-
         });
     }
 
-
     @Override
     public void onRefresh() {
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
                 mQuickAdapter.setNewData(DataServer.getSampleData(PAGE_SIZE));
                 mQuickAdapter.openLoadMore(PAGE_SIZE, true);
+                mQuickAdapter.removeAllFooterView();
                 mCurrentCounter = PAGE_SIZE;
                 mSwipeRefreshLayout.setRefreshing(false);
             }

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
@@ -336,7 +336,7 @@ public void setNewData(List<T> data) {
         this.mData = data;
         if (mRequestLoadMoreListener != null) {
             mNextLoadEnable = true;
-            mFooterLayout = null;
+            // mFooterLayout = null;
         }
         mLastPosition = -1;
         notifyDataSetChanged();
@@ -520,6 +520,8 @@ else if ((!mFootAndEmptyEnable || !mHeadAndEmptyEnable) && position == 1 && mFoo
                 return LOADING_VIEW;
             else
                 return FOOTER_VIEW;
+        } else if (position > mData.size() + getHeaderLayoutCount()) {
+            return FOOTER_VIEW;
         }
         return getDefItemViewType(position - getHeaderLayoutCount());
     }
@@ -775,7 +777,7 @@ public void removeFooterView(View footer) {
      * remove all header view from mHeaderLayout and set null to mHeaderLayout
      */
     public void removeAllHeaderView() {
-        if (mFooterLayout == null) return;
+        if (mHeaderLayout == null) return;
 
         mHeaderLayout.removeAllViews();
         mHeaderLayout = null;