From 35b6feb34956e94d6272b3c131a924a2c6655c46 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 23 Nov 2020 10:28:27 +0800
Subject: [PATCH] =?UTF-8?q?tts=E6=92=AD=E6=8A=A5-=E5=94=A4=E9=86=92?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/main/SchemeIntent.java |  3 ++-
 .../module/service/unwake/GlobalUnwakeManager.java   |  6 ++++++
 .../module/v2x/fragment/V2XEventPanelFragment.kt     | 12 ++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
index 08b519fed8..663a6f254d 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
@@ -151,6 +151,7 @@ public class SchemeIntent implements IMogoStatusChangedListener {
         if (TextUtils.isEmpty(type)) {
             return;
         }
+        Log.d("语音打开事件面板type",type);
         switch (type) {
             case TYPE_NAVI:
                 handleNaviIntent(target);
@@ -225,7 +226,7 @@ public class SchemeIntent implements IMogoStatusChangedListener {
      * 语音打开事件面板
      * */
     private void handleShowSharePanel(int item) {
-        Logger.d(TAG, "语音打开事件面板");
+        Logger.d(TAG, "语音打开事件面板" + String.valueOf(item));
         mApis.getEventPanelManager().showPanelWithSelectedItem(item);
     }
 
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
index b16b7957e7..00c3f832c4 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
@@ -3,6 +3,7 @@ package com.mogo.module.service.unwake;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.facade.template.IProvider;
@@ -73,16 +74,21 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog
                 MogoApisHandler.getInstance().getApis().getShareManager().onGlobalUnwake(intentStr, intent);
                 break;
             case VOICE_QUERY_HISTORY_INDEX:
+                Log.d("语音指令","VOICE_QUERY_HISTORY_INDEX");
                 Intent startForHis = new Intent( Intent.ACTION_VIEW );
                 startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
                 startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) );
                 context.startActivity( startForHis );
+                break;
             case VOICE_QUERY_SURROUNDING_INDEX:
+                Log.d("语音指令","VOICE_QUERY_SURROUNDING_INDEX");
                 Intent startForSurrounding = new Intent( Intent.ACTION_VIEW );
                 startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
                 startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) );
                 context.startActivity( startForSurrounding );
+                break;
             case VOICE_QUERY_HEART_INDEX:
+                Log.d("语音指令","VOICE_QUERY_HEART_INDEX");
                 Intent start = new Intent( Intent.ACTION_VIEW );
                 start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
                 start.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSharePanel" ) );
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 d7b1318b1a..6d06f2df79 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
@@ -258,14 +258,10 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     fun showPanelWithSelectedItem(item: Int) {
         mV2XShareEventsFragment.fromVoice = true
         if (isPanelShow()) {
-            if (mRbScenarioHistory?.isChecked == true) {
-                mV2XScenarioHistoryFragment.ttsForVoiceCheckout()
-            }
-            if (mRbSurroundingEvent?.isChecked == true) {
-                mV2XSurroundingFragment.ttsForVoiceCheckout()
-            }
-            if (mRbShareEvents?.isChecked == true) {
-                mV2XShareEventsFragment.ttsForVoiceCheck()
+            when (item) {
+                0 -> mV2XScenarioHistoryFragment.ttsForVoiceCheckout()
+                1 -> mV2XSurroundingFragment.ttsForVoiceCheckout()
+                else -> mV2XShareEventsFragment.ttsForVoiceCheck()
             }
         } else {
             showPanel()