From 3390ff00355e2a6b3eea728b41bae81c3d33fd2c Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 14 Aug 2020 11:37:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/network/V2XShareNetworkModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 877136cec3..c706acbe91 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 @@ -136,7 +136,7 @@ public class V2XShareNetworkModel { public void onError(Throwable e) { super.onError(e); if (callback != null){ - callback.onFail("当前服务不可以, 请稍后重试"); + callback.onFail("网络异常，点击刷新重试"); } } }); @@ -180,7 +180,7 @@ public class V2XShareNetworkModel { public void onError(Throwable e) { super.onError(e); if (callback != null){ - callback.onFail("当前服务不可以, 请稍后重试"); + callback.onFail("网络异常，点击刷新重试"); } } }); From 54e288f7b6f4147c7999ff680f1d5151a8aa1354 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 14 Aug 2020 12:03:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/adapter/V2XShareEventAdapter.java | 4 ++-- .../module/v2x/fragment/V2XShareEventsFragment.java | 11 +++++------ .../com/mogo/module/v2x/listener/AdapterCallback.java | 4 +++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 686d49e351..ee61fb7aa8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -223,7 +223,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter Date: Fri, 14 Aug 2020 12:12:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java | 4 ++-- .../java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 29f91fa0a0..c473c778ad 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 @@ -97,7 +97,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void onFail(String msg) { - loadingView.stopWithError(msg); + loadingView.stopWithError(msg,View.VISIBLE); loadingView.refresButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -183,7 +183,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void onFail(String msg) { - + loadingView.stopWithError(msg,View.INVISIBLE); } }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index b8c1e9beea..a73c2c4ccc 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -76,7 +76,7 @@ public class V2XNetworkLoadingView extends RelativeLayout { } } - public void stopWithError(String errormsg) { + public void stopWithError(String errormsg, int showRefreshButton) { if (v2XAnimationManager != null) { v2XAnimationManager.soptWithError(); } @@ -84,7 +84,7 @@ public class V2XNetworkLoadingView extends RelativeLayout { textView.setText(errormsg); } if (refresButton != null) { - refresButton.setVisibility(VISIBLE); + refresButton.setVisibility(showRefreshButton); } } From 1f0790e0e7bdae26e9a895a0528c9a62da6d7dda Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 14 Aug 2020 12:25:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8C=87=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/V2XShareEventAdapter.java | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index ee61fb7aa8..1768ed13bf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -73,31 +73,6 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter Date: Fri, 14 Aug 2020 14:36:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E9=9D=A2=E6=9D=BF=E5=85=B3=E9=97=AD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java | 1 + .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 09cfa19bf7..f1ca65c970 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -73,6 +73,7 @@ public class V2XScenarioHistoryFragment @Override public void onShearClick() { V2XServiceManager.getMogoShareManager().showShareDialog(); + V2XEventPanelFragment.Companion.getInstance().hidePanel(); } @Override 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 c473c778ad..3c876c725e 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 @@ -77,6 +77,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba /* * 获取热心指数,分享列表等分享内容 * */ + @Override public void getShareEventResponse() { animatioonAcction(View.VISIBLE); v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {