From 41a8ab94c0e768ef75f384fbf98f296550c986df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 18 Nov 2020 14:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=9C=B0=E5=9B=BE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BA=E5=AE=9A=E5=B1=95=E7=A4=BA=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     |  29 +++++++++++-------
 ...ow_bkg.png => module_v2x_shadow_bkg.9.png} | Bin
 2 files changed, 18 insertions(+), 11 deletions(-)
 rename modules/mogo-module-v2x/src/main/res/drawable-mdpi/{module_v2x_shadow_bkg.png => module_v2x_shadow_bkg.9.png} (100%)

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 b2119ea018..2d06d27c82 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,20 +12,17 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.mvp.MvpFragment
-import com.mogo.commons.voice.AIAssist
 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.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
 import com.mogo.module.v2x.utils.TrackUtils
-import com.mogo.module.v2x.utils.V2XUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
 import com.mogo.module.v2x.voice.V2XVoiceConstants
 import com.mogo.module.v2x.voice.V2XVoiceManager
 import com.mogo.utils.logger.Logger
-import com.mogo.utils.storage.SharedPrefsMgr
 
 
 /**
@@ -123,6 +120,12 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             mRbSurroundingEvent = mRootView.findViewById(R.id.rbSurroundingEvent)
             mRbShareEvents = mRootView.findViewById(R.id.rbShareEvents)
 
+            // M1 不基于地图的版本直接展示事件面板，且不可关闭
+            if (!DebugConfig.isMapBased()) {
+                mClPanelContainer?.visibility = View.VISIBLE
+                mBtnHidePanels?.visibility = View.GONE
+            }
+
             fragments = arrayOf(
                     mV2XScenarioHistoryFragment,
                     mV2XSurroundingFragment,
@@ -260,11 +263,13 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     fun showPanel() {
         Logger.d(MODULE_NAME, "in fragment show panel")
         mClPanelContainer?.visibility = View.VISIBLE
+        if (DebugConfig.isMapBased()) {
+            V2XVoiceManager.registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP, mCloeEventCb)
+        }
         // 注册语音交互
         V2XVoiceManager.registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, mCheckHistoryEventCb)
                 .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, mCheckSurroundingCb)
                 .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP, mCheckShearEventCb)
-                .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP, mCloeEventCb)
         try {
             if (isFirstLoad) {
                 mV2XScenarioHistoryFragment.presenter.loadHistory()
@@ -278,13 +283,15 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     }
 
     fun hidePanel() {
-        Logger.d(MODULE_NAME, "in fragment hide panel")
-        mClPanelContainer?.visibility = View.GONE
-        // 注册语音交互
-        V2XVoiceManager.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP)
-                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP)
-                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP)
-                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP)
+        if (DebugConfig.isMapBased()) {
+            Logger.d(MODULE_NAME, "in fragment hide panel")
+            mClPanelContainer?.visibility = View.GONE
+            // 注册语音交互
+            V2XVoiceManager.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP)
+                    .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP)
+                    .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP)
+                    .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP)
+        }
     }
 
     fun isPanelShow(): Boolean {
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png
rename to modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png