From bd1c318f79af2086e450475dfbe3e29398b0965f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 14:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=9D=A2=E5=94=A4?=
 =?UTF-8?q?=E9=86=92=E8=AF=AD=E5=8F=A5=E6=93=8D=E6=8E=A7=20http://jira.zhi?=
 =?UTF-8?q?daohulian.com/browse/E85XJD-151?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     | 57 ++++++++++++++++++-
 .../module/v2x/voice/V2XVoiceConstants.java   | 24 +++++++-
 2 files changed, 77 insertions(+), 4 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 0627defe4c..ff0cfbf53c 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
@@ -1,7 +1,7 @@
 package com.mogo.module.v2x.fragment
 
+import android.content.Intent
 import android.view.View
-import android.widget.RadioGroup
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
@@ -13,6 +13,9 @@ 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.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 kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.*
 
@@ -39,6 +42,42 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         }
     }
 
+    // 打开出行动态TAB
+    private val mCheckHistoryEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            rgTabSelect?.check(R.id.rbScenarioHistory)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    // 打开周边事件TAB
+    private val mCheckSurroundingCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            rgTabSelect?.check(R.id.rbSurroundingEvent)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    // 打开我的分享TAB
+    private val mCheckShearEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            rgTabSelect?.check(R.id.rbShareEvents)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    // 打关闭事件面板
+    private val mCloeEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            hidePanel()
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
     override fun getLayoutId(): Int {
         return R.layout.module_v2x_event_panel_fragment_event_panel
     }
@@ -56,8 +95,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             vpEventPanel.adapter = V2XEventPagerAdapter(this, fragments!!)
             vpEventPanel.isUserInputEnabled = false; //true:滑动，false：禁止滑动
 
-            val radioGroup = findViewById<View>(R.id.rgTabSelect) as RadioGroup?
-            radioGroup!!.setOnCheckedChangeListener { group, checkedId ->
+            rgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
                 when (checkedId) {
                     R.id.rbScenarioHistory -> {
                         TrackUtils.trackV2xHistoryEvent(2)
@@ -106,12 +144,25 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         Logger.d(MODULE_NAME, "in fragment show panel")
         clPanelContainer.visibility = View.VISIBLE
 //        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true)
+        // 注册语音交互
+
+        //Logger.w(MODULE_NAME, "列表View V2XPushEventDetailVH 触发 onViewAttachedToWindow");
+        // 注册语音交互
+        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)
     }
 
     fun hidePanel() {
         Logger.d(MODULE_NAME, "in fragment hide panel")
         clPanelContainer.visibility = View.GONE
 //        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false)
+        // 注册语音交互
+        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/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java
index 82aaaeaeb8..78aefa1956 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java
@@ -151,7 +151,7 @@ public class V2XVoiceConstants {
      * 关闭路况详情
      */
     public static final String COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP = "COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP";
-    public static final String[] COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP_WORDS = {"关闭"};
+    public static final String[] COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP_WORDS = {"关闭", "关闭页面"};
     /**
      * 应用内免唤醒
      * 反馈"正确"语音回调
@@ -207,6 +207,24 @@ public class V2XVoiceConstants {
     public static final String COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP";
     public static final String[] COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP_WORDS = {"没用"};
 
+    /**
+     * 出行动态
+     */
+    public static final String COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP";
+    public static final String[] COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP_WORDS = {"出行动态"};
+
+    /**
+     * 周边事件
+     */
+    public static final String COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP";
+    public static final String[] COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP_WORDS = {"周边事件"};
+
+    /**
+     * 我的分享
+     */
+    public static final String COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP";
+    public static final String[] COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP_WORDS = {"我的分享"};
+
     static {
         // 免唤醒 默认
         sVoiceCmds.put(COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP, COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP_WORDS);
@@ -230,6 +248,10 @@ public class V2XVoiceConstants {
         sVoiceCmds.put(COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_YOUYONG_UN_WAKEUP, COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_YOUYONG_UN_WAKEUP_WORDS);
         sVoiceCmds.put(COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP, COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP_WORDS);
 
+        sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP_WORDS);
+        sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP_WORDS);
+        sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP_WORDS);
+
 
         //默认
        /* sCmds.add(COMMAND_ZHIDAO_V2X_CALL_CHATTING);