From b3a51f064c4dfb27f54cd9526803338d2e8dc296 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Sat, 13 Aug 2022 16:26:49 +0000
Subject: [PATCH] 添加注释，部分优化
---
app/src/main/java/com/runt/open/mvvm/base/model/LoadPageViewModel.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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 bc7a5d7..1f7fc47 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
@@ -1,15 +1,15 @@
package com.runt.open.mvvm.base.model;
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 io.reactivex.Observable;
+import java.util.Map;
/**
* 分页
@@ -23,40 +23,42 @@
/**
* 请求地址
- * @param page 页数
- * @param objects 参数
* @return
*/
- public abstract Observable<HttpApiResult<PageResult<D>>> request(int page,Object... objects);
+ protected abstract String requestUrl();
/**
* 数据请求
+ * @param page 页数
+ * @param param 请求参数
*/
- public void requestData(Observable<HttpApiResult<PageResult<D>>> observable){
+ public void requestData(int page, Map param){
final ParameterizedType type = (ParameterizedType) this.getClass().getGenericSuperclass();
Class<D> entityClass = (Class<D>) type.getActualTypeArguments()[0];
- httpObserverOn( observable, new PageHttpObserver());
- }
+ httpObserverOn( commonApi.getPageData(requestUrl(), page, SIZE, param), new HttpObserver<PageResult>() {
+ @Override
+ protected void onSuccess(PageResult data) {
+ //数据转换
+ ArrayList<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 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