From 2872d82fd8ae905cccc05af4f029c636ef9d7e68 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 04:15:40 +0000
Subject: [PATCH] Merge branch 'master' into page

---
 app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java b/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java
index f295882..35e5ca6 100644
--- a/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java
+++ b/app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java
@@ -16,9 +16,7 @@
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.lang.reflect.ParameterizedType;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2021/11/4 0004.
@@ -77,22 +75,25 @@
         refresh.autoRefresh();
     }
 
-    protected Map requestParams() {
-        return new HashMap();
-    }
+    /**
+     * 参数
+     * @return
+     */
+    protected Object[] requestParams(){return null;};
 
     @Override
     public void onRefresh(@NonNull RefreshLayout refreshLayout) {
         page = 0;
-        mViewModel.requestData(page,requestParams());
+        mViewModel.requestData(mViewModel.request(page,requestParams()));
     }
 
     @Override
     public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
         page++;
-        mViewModel.requestData(page,requestParams());
+        mViewModel.requestData(mViewModel.request(page,requestParams()));
     }
 
+
     public A getAdapter() {
         return adapter;
     }

--
Gitblit v1.9.1