From 6c29fda2b7408c13a486554c5be9d3c6b8296b95 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Thu, 11 Aug 2022 09:01:04 +0000
Subject: [PATCH] 设置界面

---
 app/src/main/java/com/runt/open/mvvm/base/model/LoadPageViewModel.java |   54 +++++++++++++++++++++++-------------------------------
 1 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/runt/open/mvvm/base/model/LoadPageViewModel.java b/app/src/main/java/com/runt/open/mvvm/base/model/LoadPageViewModel.java
index a001534..937ab38 100644
--- a/app/src/main/java/com/runt/open/mvvm/base/model/LoadPageViewModel.java
+++ b/app/src/main/java/com/runt/open/mvvm/base/model/LoadPageViewModel.java
@@ -2,17 +2,13 @@
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.google.gson.Gson;
 import com.runt.open.mvvm.data.HttpApiResult;
 import com.runt.open.mvvm.data.PageResult;
 import com.runt.open.mvvm.retrofit.observable.HttpObserver;
 
-import org.json.JSONObject;
-
-import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+
+import io.reactivex.Observable;
 
 /**
  * 分页
@@ -21,47 +17,43 @@
 public abstract class LoadPageViewModel<D> extends BaseViewModel {
 
     public final int SIZE = 10;
-    private MutableLiveData<List<D>> liveData = new MutableLiveData<>();
+    private MutableLiveData<ArrayList<D>> liveData = new MutableLiveData<>();
     private MutableLiveData liveFailed = new MutableLiveData();
 
     /**
      * 请求地址
+     * @param page      页数
+     * @param objects   参数
      * @return
      */
-    protected abstract String requestUrl();
+    public abstract Observable<HttpApiResult<PageResult<D>>> request(int page,Object... objects);
 
     /**
      * 数据请求
-     * @param page  页数
-     * @param param 请求参数
      */
-    public void requestData(int page,Map param){
-        final ParameterizedType type = (ParameterizedType) this.getClass().getGenericSuperclass();
-        Class<D> entityClass = (Class<D>) type.getActualTypeArguments()[0];
-        httpObserverOn( commonApi.getPageData(requestUrl(), page, SIZE, param), new HttpObserver<PageResult>() {
-            @Override
-            protected void onSuccess(PageResult data) {
-                //数据转换
-                List<D> list = new ArrayList<>();
-                for(Object map : data.rows){
-                    list.add(new Gson().fromJson(new JSONObject((Map) map).toString(),entityClass));
-                }
-                liveData.postValue(list);
-            }
-
-            @Override
-            protected void onFailed(HttpApiResult httpResult) {
-                mActivity.showToast(httpResult.msg);
-                liveFailed.postValue(1);
-            }
-        });
+    public void requestData(Observable<HttpApiResult<PageResult<D>>> observable){
+        httpObserverOn( observable, new PageHttpObserver());
     }
 
-    public MutableLiveData<List<D>> getLiveData(){
+    public MutableLiveData<ArrayList<D>> getLiveData(){
         return liveData;
     }
 
     public MutableLiveData getLiveFailed() {
         return liveFailed;
     }
+
+    public class PageHttpObserver extends HttpObserver<PageResult<D>> {
+        @Override
+        protected void onSuccess(PageResult<D> data) {
+            liveData.postValue(data.rows);
+        }
+
+        @Override
+        protected void onFailed(HttpApiResult httpResult) {
+            mActivity.showToast(httpResult.msg);
+            liveFailed.postValue(1);
+        }
+    }
+
 }

--
Gitblit v1.9.1