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

---
 app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 58a319a..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
@@ -17,7 +17,6 @@
 
 import java.lang.reflect.ParameterizedType;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2021/11/4 0004.
@@ -76,20 +75,25 @@
         refresh.autoRefresh();
     }
 
-    protected abstract Map requestParams();
+    /**
+     * 参数
+     * @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