From 5bf6c52fe1eb885bc0774e13776692508194eb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 4 Aug 2020 17:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E4=BC=98=E5=8C=96=E3=80=8D=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=BE=97=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/fragment/EventPanelFragment.kt | 7 ++++- .../v2x/fragment/ScenarioHistoryFragment.java | 27 ++++++++++++++++--- .../v2x/manager/IMoGoV2XStatusManager.java | 13 +++++++++ .../v2x/manager/V2XStatusDescriptor.java | 5 ++++ .../manager/impl/MoGoV2XStatusManager.java | 12 +++++++++ 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt index 41534fccf3..11a55d3eb7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/EventPanelFragment.kt @@ -13,6 +13,7 @@ import com.google.android.material.tabs.TabLayoutMediator.TabConfigurationStrate import com.mogo.commons.mvp.MvpFragment import com.mogo.module.v2x.R import com.mogo.module.v2x.V2XConst.MODULE_NAME +import com.mogo.module.v2x.V2XServiceManager import com.mogo.module.v2x.adapter.EventPagerAdapter import com.mogo.module.v2x.presenter.EventPanelPresenter import com.mogo.utils.logger.Logger @@ -26,6 +27,7 @@ import kotlinx.android.synthetic.main.module_event_panel_fragment_event_panel.* */ class EventPanelFragment : MvpFragment() { + private val TAG = "EventPanelFragment" private val tabsTitle = arrayOf("出行动态", "周边事件", "我的分享") private var fragments: Array? = null @@ -35,7 +37,7 @@ class EventPanelFragment : MvpFragment( private val activeColor: Int = android.graphics.Color.parseColor("#ff678f") private val normalColor: Int = android.graphics.Color.parseColor("#EE00FF") - private val activeSize = 40 + private val activeSize = 35 private val normalSize = 30 private var selectPosition = 0 @@ -126,12 +128,15 @@ class EventPanelFragment : MvpFragment( Logger.d(MODULE_NAME, "in fragment show panel") clPanelContainer.visibility = View.VISIBLE btnShowOrHidePanels.text = "隐藏面板" + V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true) } fun hidePanel() { Logger.d(MODULE_NAME, "in fragment hide panel") clPanelContainer.visibility = View.GONE btnShowOrHidePanels.text = "显示面板" + V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false) + } fun isPanelShow(): Boolean { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java index 3887272da7..5f87bab15d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java @@ -1,16 +1,19 @@ package com.mogo.module.v2x.fragment; +import android.content.Context; import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.adapter.ScenarioHistoryAdapter; +import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener; +import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.utils.logger.Logger; @@ -26,6 +29,7 @@ import java.util.List; */ public class ScenarioHistoryFragment extends MvpFragment { + private String TAG = "ScenarioHistoryFragment"; private RecyclerView mRecyclerView; private ScenarioHistoryAdapter mScenarioHistoryAdapter; @@ -38,7 +42,22 @@ public class ScenarioHistoryFragment @Override protected void initViews() { - Log.d("ScenarioHistoryFragment", "initViews --------> "); + Log.d(TAG, "initViews --------> "); + V2XServiceManager.getMoGoV2XStatusManager() + .registerStatusChangedListener( + TAG, + V2XStatusDescriptor.EventPanelWindow_UI, + new IMoGoV2XStatusChangedListener() { + @Override + public void onStatusChanged(V2XStatusDescriptor descriptor, boolean isTrue) { + Log.d(TAG, descriptor + " initViews --------> " + isTrue); + } + + @Override + public void init(Context context) { + Log.d(TAG, "init --------> "); + } + }); mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); mScenarioHistoryAdapter = new ScenarioHistoryAdapter(mV2XHistoryScenarioData); @@ -48,7 +67,7 @@ public class ScenarioHistoryFragment mRecyclerView.setLayoutManager(layoutManager); List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); - Logger.d("ScenarioHistoryFragment", "查询到历史消息：" + GsonUtil.jsonFromObject(v2XHistoryScenarioData)); + Logger.d(TAG, "查询到历史消息：" + GsonUtil.jsonFromObject(v2XHistoryScenarioData)); mV2XHistoryScenarioData.clear(); mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); mScenarioHistoryAdapter.notifyDataSetChanged(); @@ -58,7 +77,7 @@ public class ScenarioHistoryFragment public void onResume() { super.onResume(); List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); - Logger.d("ScenarioHistoryFragment", "查询到历史消息：" + v2XHistoryScenarioData); + Logger.d(TAG, "查询到历史消息：" + v2XHistoryScenarioData); mV2XHistoryScenarioData.clear(); mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); mScenarioHistoryAdapter.notifyDataSetChanged(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XStatusManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XStatusManager.java index ca47257765..015fb0eea2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XStatusManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XStatusManager.java @@ -72,6 +72,11 @@ public interface IMoGoV2XStatusManager extends IProvider { */ boolean isFatigueDrivingWindowShow(); + /** + * 事件面板状态 状态 + */ + boolean isEventPanelWindowShow(); + /** * 设置 V2X道路预警POI 是否在展示 * @@ -168,6 +173,14 @@ public interface IMoGoV2XStatusManager extends IProvider { */ void setFatigueDrivingWindowShow(String tag, boolean show); + /** + * 事件面板状态 是否在展示 + * + * @param tag + * @param show + */ + void setEventPanelWindowShow(String tag, boolean show); + /** * 注册监听 * diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/V2XStatusDescriptor.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/V2XStatusDescriptor.java index 0cf7973e0a..8cf3c46ab3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/V2XStatusDescriptor.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/V2XStatusDescriptor.java @@ -67,4 +67,9 @@ public enum V2XStatusDescriptor { * 疲劳驾驶弹窗 */ FatigueDrivingWindow_UI, + + /** + * 事件面板状态 + */ + EventPanelWindow_UI, } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XStatusManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XStatusManager.java index e45906f085..44b0282c80 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XStatusManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XStatusManager.java @@ -107,6 +107,11 @@ public class MoGoV2XStatusManager implements IMoGoV2XStatusManager { return get_bool_val(V2XStatusDescriptor.FatigueDrivingWindow_UI); } + @Override + public boolean isEventPanelWindowShow() { + return get_bool_val(V2XStatusDescriptor.EventPanelWindow_UI); + } + @Override public void setRoadEventPOIShow(String tag, boolean show) { V2XServiceManager.getMoGoStatusManager().setV2XUIShow(V2XConst.MODULE_NAME, show); @@ -194,6 +199,13 @@ public class MoGoV2XStatusManager implements IMoGoV2XStatusManager { recordStatusModifier(tag, V2XStatusDescriptor.FatigueDrivingWindow_UI); } + @Override + public void setEventPanelWindowShow(String tag, boolean show) { + mStatus.put(V2XStatusDescriptor.EventPanelWindow_UI, show); + invokeStatusChangedListener(V2XStatusDescriptor.EventPanelWindow_UI, show); + recordStatusModifier(tag, V2XStatusDescriptor.EventPanelWindow_UI); + } + @Override public void registerStatusChangedListener(String tag, V2XStatusDescriptor descriptor, IMoGoV2XStatusChangedListener listener) { if (listener == null || descriptor == null) {