diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index ed9ec784ae..02c866129f 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -47,8 +47,7 @@ public class MapPresenter extends Presenter< MapView > implements IMogoVoiceCmdCallBack { private static final String TAG = "MapPresenter"; - private static final String AUTONAVI_STANDARD_BROADCAST_RECV = - "AUTONAVI_STANDARD_BROADCAST_RECV"; + private static final String AUTONAVI_STANDARD_BROADCAST_RECV = "AUTONAVI_STANDARD_BROADCAST_RECV"; private IMogoMapService mMogoMapService; private IMogoIntentManager mMogoIntentManager; private IMogoSearchManager mSearchManager; @@ -70,6 +69,7 @@ public class MapPresenter extends Presenter< MapView > implements @Override public void onReceive( Context context, Intent intent ) { String action = intent.getAction(); + Logger.d( TAG, "action = %s", action ); if ( TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_RECV ) ) { int key_type = intent.getIntExtra( "KEY_TYPE", 0 ); int type = intent.getIntExtra( "EXTRA_TYPE", -1 ); @@ -263,13 +263,11 @@ public class MapPresenter extends Presenter< MapView > implements case VoiceConstants.CMD_MAP_TRAFFIC_MODE: AIAssist.getInstance( getContext() ).speakTTSVoice( "已打开", null ); mView.getUIController().setTrafficEnabled( true ); - mSearchManager.showSearch(); break; case VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_UN_WAKEUP: case VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE: AIAssist.getInstance( getContext() ).speakTTSVoice( "已关闭", null ); mView.getUIController().setTrafficEnabled( false ); - mSearchManager.showMain(); break; case VoiceConstants.CMD_MAP_ZOOM_IN_UN_WAKEUP: case VoiceConstants.CMD_MAP_ZOOM_IN: @@ -328,15 +326,11 @@ public class MapPresenter extends Presenter< MapView > implements mView.getUIController().changeMapMode( EnumMapUI.Type_AUTO_LIGHT_Night ); AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null ); break; - case VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE_UN_WAKEUP: case VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE: - AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null ); mView.getUIController().displayOverview(); break; - case VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE_UN_WAKEUP: case VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE: mView.getUIController().recoverLockMode(); - AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null ); break; case VoiceConstants.CMD_MAP_CAR_UP_MODE_UN_WAKEUP: case VoiceConstants.CMD_MAP_CAR_UP_MODE: diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java index 05a2a6dd1c..ac7113e13a 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java @@ -102,15 +102,11 @@ public class VoiceConstants { * 导航全览 */ public static final String CMD_MAP_DISPLAY_OVERVIEW_MODE = "com.ileja.navi.map.full"; - public static final String CMD_MAP_DISPLAY_OVERVIEW_MODE_UN_WAKEUP = "CMD_MAP_DISPLAY_OVERVIEW_MODE_UN_WAKEUP"; - public static final String[] CMD_MAP_DISPLAY_OVERVIEW_MODE_TRIGGER_WORDS = {"进入全览", "查看全程"}; /** * 继续导航 */ public static final String CMD_MAP_CONTINUE_NAVI_MODE = "com.ileja.navi.route.continue"; - public static final String CMD_MAP_CONTINUE_NAVI_MODE_UN_WAKEUP = "CMD_MAP_CONTINUE_NAVI_MODE_UN_WAKEUP"; - public static final String[] CMD_MAP_CONTINUE_NAVI_MODE_MODE_TRIGGER_WORDS = {"继续导航"}; /**