From 18b2a894226b139652adc91e20a2d1e5580c7f7e Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 04:07:20 +0000
Subject: [PATCH] 合并优化

---
 app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java  |   15 ++++++++-------
 app/src/main/java/com/runt/open/mvvm/base/activities/LoadPageActivity.java |   15 ++++++++-------
 app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java     |    4 ++--
 app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java       |   12 ++++++++----
 4 files changed, 26 insertions(+), 20 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;
     }
diff --git a/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java b/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java
index 5b20f7b..f0f1986 100644
--- a/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.java
+++ b/app/src/main/java/com/runt/open/mvvm/base/fragments/LoadPageFragment.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;
 
 /**
  * 分页fragment 封装
@@ -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;
     }
diff --git a/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java b/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java
index 964fd28..0922a46 100644
--- a/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java
+++ b/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java
@@ -4,7 +4,7 @@
 import com.runt.open.mvvm.data.ApkUpGradeResult;
 import com.runt.open.mvvm.data.HttpApiResult;
 import com.runt.open.mvvm.data.PageResult;
-import com.runt.open.mvvm.ui.main.home.Message;
+import com.runt.open.mvvm.data.Results;
 
 import java.util.Map;
 
@@ -84,5 +84,5 @@
      * @return
      */
     @GET("getMsgList")
-    Observable<HttpApiResult<PageResult<Message>>> getMsgList(@Query("page") int pageNum, @Query("size") int pageSize);
+    Observable<HttpApiResult<PageResult<Results.Message>>> getMsgList(@Query("page") int pageNum, @Query("size") int pageSize);
 }
diff --git a/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java
index 2af3994..dba8b38 100644
--- a/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java
+++ b/app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java
@@ -1,16 +1,20 @@
 package com.runt.open.mvvm.ui.loadpage;
 
 import com.runt.open.mvvm.base.model.LoadPageViewModel;
-import com.runt.open.mvvm.ui.main.home.Message;
+import com.runt.open.mvvm.data.HttpApiResult;
+import com.runt.open.mvvm.data.PageResult;
+import com.runt.open.mvvm.data.Results;
+
+import io.reactivex.Observable;
 
 /**
  * @purpose Created by Runt (qingingrunt2010@qq.com) on 2022/8/9.
  */
 public class PageViewModels {
-    public class HomeViewModel extends LoadPageViewModel<Message> {
+    public class HomeViewModel extends LoadPageViewModel<Results.Message> {
         @Override
-        protected String requestUrl() {
-            return "getMsgList";
+        public Observable<HttpApiResult<PageResult<Results.Message>>> request(int page, Object... objects) {
+            return commonApi.getMsgList(page,SIZE);
         }
     }
 }

--
Gitblit v1.9.1