From 7f803d47b955630a15e4d81e56acdc93cef063e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 14 Aug 2020 12:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8E=86=E5=8F=B2=E5=87=BA=E8=A1=8C?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=E4=BD=BF=E7=94=A8=E5=AD=90?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?ANR=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 @@