From 72c0cb27aed547dc55bdb17418537f59aeba303f 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 f9b8707745d382f0d93980d15bc47120145e152c 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 d6b68ba10b9e4a74a4f4f78c989e74e372e68739 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 12:40:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B0=86=E5=8E=86=E5=8F=B2=E5=87=BA?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8B=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2ANR=20http://jira.zhidaohulian.com/browse/E85XJD-150?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XEventPanelFragment.kt | 82 +++++++++---------- .../fragment/V2XScenarioHistoryFragment.java | 26 +++--- .../presenter/ScenarioHistoryPresenter.java | 8 +- ...e_v2x_event_panel_fragment_event_panel.xml | 2 +- 4 files changed, 64 insertions(+), 54 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 3542bee411..0627defe4c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -12,7 +12,6 @@ import com.mogo.module.v2x.V2XServiceManager import com.mogo.module.v2x.adapter.V2XEventPagerAdapter import com.mogo.module.v2x.presenter.EventPanelPresenter import com.mogo.module.v2x.utils.TrackUtils -import com.mogo.module.v2x.utils.V2XSQLiteUtils import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView import com.mogo.utils.logger.Logger import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.* @@ -46,51 +45,52 @@ class V2XEventPanelFragment : MvpFragment(R.id.rgTabSelect) as RadioGroup? - radioGroup!!.setOnCheckedChangeListener { group, checkedId -> - when (checkedId) { - R.id.rbScenarioHistory -> { - TrackUtils.trackV2xHistoryEvent(2) - vpEventPanel.setCurrentItem(0, false) - } - R.id.rbSurroundingEvent -> { - TrackUtils.trackV2xHistoryEvent(3) - vpEventPanel.setCurrentItem(1, false) - } - R.id.rbShareEvents -> { - TrackUtils.trackV2xHistoryEvent(4) - vpEventPanel.setCurrentItem(2, false) + val radioGroup = findViewById(R.id.rgTabSelect) as RadioGroup? + radioGroup!!.setOnCheckedChangeListener { group, checkedId -> + when (checkedId) { + R.id.rbScenarioHistory -> { + TrackUtils.trackV2xHistoryEvent(2) + vpEventPanel.setCurrentItem(0, false) + } + R.id.rbSurroundingEvent -> { + TrackUtils.trackV2xHistoryEvent(3) + vpEventPanel.setCurrentItem(1, false) + } + R.id.rbShareEvents -> { + TrackUtils.trackV2xHistoryEvent(4) + vpEventPanel.setCurrentItem(2, false) + } } } - } - btnHidePanels.setOnClickListener { - TrackUtils.trackV2xHistoryEvent(5) - hidePanel() - } - - mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context) - mV2XEventPanelHistoryCountView!!.setOnClickListener { - TrackUtils.trackV2xHistoryEvent(1) - if (!isPanelShow()) { - showPanel() - } else { + btnHidePanels.setOnClickListener { + TrackUtils.trackV2xHistoryEvent(5) hidePanel() } - } - V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView) - changeEventCount() + mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context) + mV2XEventPanelHistoryCountView!!.setOnClickListener { + if (!isPanelShow()) { + TrackUtils.trackV2xHistoryEvent(1) + showPanel() + } + } + V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView) + changeEventCount() + } catch (e: Exception) { + e.printStackTrace() + } } override fun onDestroyView() { @@ -105,13 +105,13 @@ class V2XEventPanelFragment : MvpFragment v2XHistoryScenarioData) { Logger.d(TAG, "查询到历史消息：" + GsonUtil.jsonFromObject(v2XHistoryScenarioData)); - mV2XHistoryScenarioData.clear(); - if (v2XHistoryScenarioData.size() > 0) { - mEmptyView.setVisibility(View.GONE); - mClHistoryList.setVisibility(View.VISIBLE); - mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); - } else { - mEmptyView.setVisibility(View.VISIBLE); - mClHistoryList.setVisibility(View.GONE); - } - mV2XScenarioHistoryAdapter.notifyDataSetChanged(); + ThreadUtils.runOnUiThread(new Runnable() { + @Override + public void run() { + mV2XHistoryScenarioData.clear(); + if (v2XHistoryScenarioData.size() > 0) { + mEmptyView.setVisibility(View.GONE); + mClHistoryList.setVisibility(View.VISIBLE); + mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); + } else { + mEmptyView.setVisibility(View.VISIBLE); + mClHistoryList.setVisibility(View.GONE); + } + mV2XScenarioHistoryAdapter.notifyDataSetChanged(); + } + }); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java index d3379857c7..95b3b4ea05 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java @@ -4,7 +4,9 @@ package com.mogo.module.v2x.presenter; import com.mogo.commons.mvp.Presenter; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.v2x.fragment.V2XScenarioHistoryFragment; +import com.mogo.module.v2x.utils.ThreadUtils; import com.mogo.module.v2x.utils.V2XSQLiteUtils; +import com.mogo.utils.WorkThreadHandler; import java.util.List; @@ -18,7 +20,9 @@ public class ScenarioHistoryPresenter extends Presenter v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); - mView.loadHistory(v2XHistoryScenarioData); + WorkThreadHandler.getInstance().post(() -> { + List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); + mView.loadHistory(v2XHistoryScenarioData); + }); } } diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 051d0557f0..fc8f9f24ca 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -20,7 +20,7 @@