修复list页面设置第一页为0刷新后下一页为2的bug

yaozs · Apr 26, 2018 · e22644c · e22644c
1 parent 3669d95
commit e22644c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@
         * 17.08.02 优化默认tooblar颜色设置，自动适配项目颜色
         * 17.08.07 优化list界面自动化处理，一句代码搞定各种加载状态     autoListLoad  方法诞生
         * 18.04.19 添加YzsBaseActivity框架方法详解，整理代码，梳理逻辑
+        * 18.04.26 修复list页面设置第一页为0刷新后下一页为2的bug
 
 
 ### 本项目使用开源项目

diff --git a/...eactivitylib/src/main/java/com/yzs/yzsbaseactivitylib/yzsbase/YzsBaseMvpListFragment.java b/...eactivitylib/src/main/java/com/yzs/yzsbaseactivitylib/yzsbase/YzsBaseMvpListFragment.java
@@ -61,6 +61,7 @@ public abstract class YzsBaseMvpListFragment<T extends BasePresenter, E extends
 
     private int mPage = 1;
     private int mPageSize = 10;
+    private int startPageNum = 1;
 
     public void setmPageSize(int mPageSize) {
         this.mPageSize = mPageSize;
@@ -239,7 +240,7 @@ protected void convert(BaseViewHolder baseViewHolder, D t) {
     public void okRefresh() {
         judgeViewIsNull();
         if (mAdapter != null) {
-            mPage = 2;
+            mPage = startPageNum+1;
             mRefreshLayout.finishRefresh();
             mRefreshLayout.setLoadmoreFinished(false);//恢复上拉状态
             Logger.d("refresh_complete");
@@ -248,7 +249,7 @@ public void okRefresh() {
 
     public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes int Empty_res) {
         tList = tList == null ? new ArrayList<D>() : tList;
-        if (getPage() == 1) {
+        if (getPage() == startPageNum) {
             okRefresh();
             mAdapter.setNewData(tList);
             if (tList.size() == 0) {
@@ -273,7 +274,7 @@ public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes
      * @param isFail
      */
     public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes int empty_res, boolean isFail) {
-        if (isFail && getPage() != 1) {
+        if (isFail && getPage() != startPageNum) {
             failLoadMore();
         } else {
             autoListLoad(tList, empty_str, empty_res);
@@ -312,6 +313,7 @@ public int getPage() {
 
     public void setPage(int page) {
         mPage = page;
+        startPageNum = page;
     }
 
 

diff --git a/...ivitylib/src/main/java/com/yzs/yzsbaseactivitylib/yzsbase/YzsBaseMvpListTypeFragment.java b/...ivitylib/src/main/java/com/yzs/yzsbaseactivitylib/yzsbase/YzsBaseMvpListTypeFragment.java
@@ -65,6 +65,7 @@ public abstract class YzsBaseMvpListTypeFragment<T extends BasePresenter, E exte
 
     private int mPage = 1;
     private int mPageSize = 10;
+    private int startPageNum = 1;
 
     public void setmPageSize(int mPageSize) {
         this.mPageSize = mPageSize;
@@ -243,7 +244,7 @@ public void addItemType(int type, @LayoutRes int layoutResId) {
      */
     public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes int empty_res) {
         tList = tList == null ? new ArrayList<D>() : tList;
-        if (getPage() == 1) {
+        if (getPage() == startPageNum) {
             okRefresh();
             mAdapter.setNewData(tList);
             if (tList.size() == 0) {
@@ -268,7 +269,7 @@ public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes
      * @param isFail
      */
     public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes int empty_res, boolean isFail) {
-        if (isFail && getPage() != 1) {
+        if (isFail && getPage() != startPageNum) {
             failLoadMore();
         } else {
             autoListLoad(tList, empty_str, empty_res);
@@ -285,7 +286,7 @@ public void autoListLoad(@Nullable List<D> tList, String empty_str, @DrawableRes
     public void okRefresh() {
         judgeViewIsNull();
         if (mAdapter != null) {
-            mPage = 2;
+            mPage = startPageNum + 1;
             mRefreshLayout.finishRefresh();
             mRefreshLayout.setLoadmoreFinished(false);//恢复上拉状态
             Logger.d("refresh_complete");
@@ -321,6 +322,7 @@ public int getPage() {
 
     public void setPage(int page) {
         mPage = page;
+        startPageNum = page;
     }
 
     /**