PaginationBean.java PaginationMapUtil.java添加

base_library/src/main/java/com/mgtech/base_library/bean/PaginationBean.java

@@ -0,0 +1,100 @@
+package com.mgtech.base_library.bean;
+
+/**
+ * @ProjectName: BaseLibrary
+ * @Package: com.mgtech.base_library.bean.requestModule
+ * @ClassName: PaginationBean
+ * @Description: 分页数据
+ * @Author: niusongtao
+ * @CreateDate: 2020/10/26 16:31
+ * @UpdateUser: 更新者：niusongtao
+ * @UpdateDate: 2020/10/26 16:31
+ * @UpdateRemark: 更新说明：
+ * @Version: 1.0
+ */
+public class PaginationBean {
+
+    /**
+     * page : {"hasNextPage":true,"lastPage":false,"nextPageNum":2,"pageNum":1,"pageSize":10,"total":15}
+     */
+
+    private PageBean page;
+
+    public PageBean getPage() {
+        return page;
+    }
+
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
+
+    public static class PageBean {
+        /**
+         * hasNextPage : true
+         * lastPage : false
+         * nextPageNum : 2
+         * pageNum : 1
+         * pageSize : 10
+         * total : 15
+         */
+
+        private boolean hasNextPage;
+        private boolean lastPage;
+        private int nextPageNum;
+        private int pageNum;
+        private int pageSize;
+        private int total;
+
+        public boolean isHasNextPage() {
+            return hasNextPage;
+        }
+
+        public void setHasNextPage(boolean hasNextPage) {
+            this.hasNextPage = hasNextPage;
+        }
+
+        public boolean isLastPage() {
+            return lastPage;
+        }
+
+        public void setLastPage(boolean lastPage) {
+            this.lastPage = lastPage;
+        }
+
+        public int getNextPageNum() {
+            return nextPageNum;
+        }
+
+        public void setNextPageNum(int nextPageNum) {
+            this.nextPageNum = nextPageNum;
+        }
+
+        public int getPageNum() {
+            return pageNum;
+        }
+
+        public void setPageNum(int pageNum) {
+            this.pageNum = pageNum;
+        }
+
+        public int getPageSize() {
+            return pageSize;
+        }
+
+        public void setPageSize(int pageSize) {
+            this.pageSize = pageSize;
+        }
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+    }
+
+    public PaginationBean getPaginationBean(){
+        return this;
+    }
+}

base_library/src/main/java/com/mgtech/base_library/util/CommonPreviewPopWindow.java

@@ -42,7 +42,7 @@ public class CommonPreviewPopWindow extends PopupWindow {
 
     private List<String> photoSelectList;
 
-    private int currPage = 1;
+    private int currPage;
 
     private PreviewAdapter previewAdapter = new PreviewAdapter();
 
@@ -54,11 +54,11 @@ public class CommonPreviewPopWindow extends PopupWindow {
         initPopWindow();
     }
 
-    public void setPhotoSelectList(int currPage,List<String> photoSelectList){
+    public void setPhotoSelectList(List<String> photoSelectList){
         this.photoSelectList = photoSelectList;
-        this.currPage = currPage;
+        currPage = 1;
         myTitleView.setTitleText(currPage + "/" +photoSelectList.size());
-        viewPager.setCurrentItem(currPage);
+//        viewPager.setCurrentItem(currPage);
         addView();
     }
 

base_library/src/main/java/com/mgtech/base_library/util/PaginationMapUtil.java

@@ -1,5 +1,8 @@
 package com.mgtech.base_library.util;
 
+import com.mgtech.base_library.bean.PaginationBean;
+
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -15,9 +18,11 @@ import java.util.Map;
  * @Version: 1.0
  */
 public class PaginationMapUtil {
+    private static String PAGE_NUM = "pageNum";
 
-    public static Map<String,Object> getPaginationMap(Map<String,Object> map,int page){
-        map.put("page",page);
+    public static Map<String,Object> getPaginationMap(PaginationBean.PageBean paginationBean){
+        Map<String,Object> map = new HashMap<>();
+        map.put(PAGE_NUM,paginationBean.getNextPageNum());
         return map;
     }
 }