opt

modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java

@@ -270,8 +270,7 @@ public class MapPresenter extends Presenter< MapView > implements
     private void registerVoiceCmd() {
 
         for ( Map.Entry< String, String[] > entry : VoiceConstants.sVoiceCmds.entrySet() ) {
-            AIAssist.getInstance( getContext() )
-                    .registerUnWakeupCommand( entry.getKey(), entry.getValue(), this );
+            AIAssist.getInstance( getContext() ).registerUnWakeupCommand( entry.getKey(), entry.getValue(), this );
         }
 
         for ( String cmd : VoiceConstants.sCmds ) {
@@ -304,12 +303,10 @@ public class MapPresenter extends Presenter< MapView > implements
         switch ( cmd ) {
             case VoiceConstants.CMD_MAP_TRAFFIC_MODE_UN_WAKEUP:
             case VoiceConstants.CMD_MAP_TRAFFIC_MODE:
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已打开", null );
                 mView.getUIController().setTrafficEnabled( true );
                 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 );
                 break;
             case VoiceConstants.CMD_MAP_ZOOM_IN_UN_WAKEUP:

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -30,6 +30,7 @@ import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoCongestionInfo;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
+import com.mogo.map.uicontroller.CarCursorOption;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoModule;
@@ -667,6 +668,11 @@ public class MogoServices implements IMogoMapListener,
                 }
                 break;
             case SEEK_HELPING:
+                if ( isTrue ) {
+                    mUiController.setCarCursorOption( new CarCursorOption.Builder().carCursorRes( R.drawable.module_service_ic_seek_helping ).build() );
+                } else {
+                    mUiController.setCarCursorOption( null );
+                }
                 notifySeekHelpingStatusChanged( isTrue );
                 break;
         }
@@ -785,13 +791,11 @@ public class MogoServices implements IMogoMapListener,
             }
         } else if ( ServiceConst.COMMAND_NEXT.equals( command ) ) {
             if ( mStatusManager.isMainPageOnResume() ) {
-                mActionManager.invoke( MapMarkerManager.getInstance().getCurrentModuleName(),
-                        MogoAction.Next );
+                mActionManager.invoke( MapMarkerManager.getInstance().getCurrentModuleName(), MogoAction.Next );
             }
         } else if ( ServiceConst.COMMAND_PREVIOUS.equals( command ) ) {
             if ( mStatusManager.isMainPageOnResume() ) {
-                mActionManager.invoke( MapMarkerManager.getInstance().getCurrentModuleName(),
-                        MogoAction.Prev );
+                mActionManager.invoke( MapMarkerManager.getInstance().getCurrentModuleName(), MogoAction.Prev );
             }
         } else if ( ServiceConst.COMMAND_SWITCH_CARD.equals( command ) ) {
             String data = intent.getStringExtra( "data" );
@@ -850,6 +854,11 @@ public class MogoServices implements IMogoMapListener,
             }
             if ( mStatusManager.isMainPageOnResume() ) {
                 mUiController.recoverLockMode();
+            } else {
+                mLauncher.backToLauncher( mContext );
+                UiThreadHandler.postDelayed( () -> {
+                    mUiController.recoverLockMode();
+                }, 2_000L );
             }
         } else if ( MogoReceiver.ACTION_MOCK.equals( command ) ) {
             final int oper = intent.getIntExtra( "oper", -1 );
@@ -857,6 +866,9 @@ public class MogoServices implements IMogoMapListener,
                 case 1:
                     mUiController.showMyLocation( true );
                     break;
+                case 2:
+                    mStatusManager.setSeekHelping( TAG, false );
+                    break;
             }
         }
     }