From 75c87c81a94d278d6bb0aa048639e7feb1695acb Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 3 Aug 2020 11:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95sn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XShareEventsFragment.java | 8 ++++++-- .../res/layout/module_v2x_event_share_empty.xml | 4 ++-- .../layout/module_v2x_event_share_recylerview.xml | 15 ++++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 238bb841a2..715868cb3a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.module.v2x.R; import com.mogo.module.v2x.adapter.V2XShareEventAdapter; import com.mogo.module.v2x.entity.panel.ShareEventDescription; @@ -32,6 +33,8 @@ import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; +import com.mogo.utils.network.utils.Util; + import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -97,7 +100,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba * */ private void getShareEventDescription() { //ZD802B1932L00622 测试数据sn - ShareEventParameter parameter = new ShareEventParameter("ZD802B1932L00622"); + ShareEventParameter parameter = new ShareEventParameter(Utils.getSn()); Map parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); @@ -128,7 +131,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba * 分享列表 * */ public void getShareEventList(int page, int size) { - ShareEventParameter parameter = new ShareEventParameter("ZD802B1932L00622", page, 10); + ShareEventParameter parameter = new ShareEventParameter(Utils.getSn(), page, 10); HashMap parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); v2XAnimationManager.start(); @@ -181,6 +184,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba public void onError(String message, int code) { super.onError(message, code); countDownLatch.countDown(); + v2XAnimationManager.stop(); } }); } diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index 196f44b763..d0490ac0f7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -1,7 +1,7 @@ + android:layout_height="match_parent"> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml index ee0f345718..716ee48fd1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml @@ -8,15 +8,24 @@ + +