From 681d382ba0434c7cc2d9304600263959f01f83c0 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 5 Aug 2020 16:46:18 +0800 Subject: [PATCH] =?UTF-8?q?[rm]=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=20=E4=BD=BF=E7=94=A8ParamsProvider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/entity/net/ShareEventParameter.java | 18 --------------- .../v2x/network/V2XShareNetworkModel.java | 22 +++++++++++++------ 2 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/ShareEventParameter.java diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/ShareEventParameter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/ShareEventParameter.java deleted file mode 100644 index 39068df8fb..0000000000 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/ShareEventParameter.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.mogo.module.v2x.entity.net; - -public class ShareEventParameter { - private String sn; - private int pageNum; - private int pageSize; - - public ShareEventParameter(String sn) { - this.sn = sn; - } - - public ShareEventParameter(String sn, int pageNum, int pageSize) { - this.sn = sn; - this.pageNum = pageNum; - this.pageSize = pageSize; - } - -} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java index 7a9380c1c0..5fe35ea297 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java @@ -4,9 +4,9 @@ import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.data.BaseData; +import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.network.Utils; -import com.mogo.module.v2x.entity.net.ShareEventParameter; import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.network.RequestOptions; @@ -42,9 +42,11 @@ public class V2XShareNetworkModel { * 2.分享列表 * */ public void getShareEventResponse(int page, int size, V2XRefreshCallback callback) { - ShareEventParameter parameter = new ShareEventParameter(Utils.getSn()); - Map parameters = new HashMap<>(); - parameters.put("data", GsonUtil.jsonFromObject(parameter)); + final ParamsProvider.Builder builder = new ParamsProvider.Builder(mContext); + HashMap hashMap = new HashMap<>(); + hashMap.put("sn", Utils.getSn()); + builder.append("data", GsonUtil.jsonFromObject(hashMap)); + Map parameters = builder.build(); Observable indexObservable = Observable.create(new ObservableOnSubscribe() { @@ -130,9 +132,15 @@ public class V2XShareNetworkModel { * 分享列表 * */ public void getShareEventList(int page, int size, V2XRefreshCallback callback) { - ShareEventParameter parameter = new ShareEventParameter(Utils.getSn(), page, 10); - HashMap parameters = new HashMap<>(); - parameters.put("data", GsonUtil.jsonFromObject(parameter)); + + final ParamsProvider.Builder builder = new ParamsProvider.Builder(mContext); + HashMap hashMap = new HashMap<>(); + hashMap.put("sn", Utils.getSn()); + hashMap.put("pageNum", page); + hashMap.put("pageSize", size); + builder.append("data", GsonUtil.jsonFromObject(hashMap)); + Map parameters = builder.build(); + mRefreshApiService.getShareEventList(parameters) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread())