diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 203580640d..7d62df034a 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -239,34 +239,27 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             } else {
                 mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
             }
-            mCameraMode.setSelected(!mCameraMode.isSelected());
-            mCameraMode.setText(getString(mCameraMode.isSelected() ? R.string.mode_car_up :
-                    R.string.mode_north_up));
-        });
+            mCameraMode.setSelected( !mCameraMode.isSelected() );
+            mCameraMode.setText( getString( mCameraMode.isSelected() ? R.string.mode_car_up : R.string.mode_north_up ) );
+        } );
 
-
-        mApis.getIntentManagerApi().registerIntentListener(AUTONAVI_STANDARD_BROADCAST_RECV,
-                new IMogoIntentListener() {
-                    @Override
-                    public void onIntentReceived(String intentStr, Intent intent) {
-                        int key_type = intent.getIntExtra("KEY_TYPE", 0);
-                        int type = intent.getIntExtra("EXTRA_TYPE", -1);
-                        int opera_type = intent.getIntExtra("EXTRA_OPERA", -1);
-                        if (key_type == 10027) {
-                            if (opera_type == 0) {
-                                mCameraMode.setSelected(false);
-                            } else if (opera_type == 1) {
-                                mCameraMode.setSelected(true);
-                            }
-                            mCameraMode.setText(getString(mCameraMode.isSelected() ?
-                                    R.string.mode_car_up : R.string.mode_north_up));
-                        }
-                    }
-                });
-        MogoEntranceButtons.save(ButtonIndex.BUTTON1,
-                findViewById(R.id.module_entrance_id_button1));
-        MogoEntranceButtons.save(ButtonIndex.BUTTON2,
-                findViewById(R.id.module_entrance_id_button2));
+        mApis.getIntentManagerApi().registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, (( intentStr, intent ) -> {
+            int key_type = intent.getIntExtra( "KEY_TYPE", 0 );
+            int type = intent.getIntExtra( "EXTRA_TYPE", -1 );
+            int opera_type = intent.getIntExtra( "EXTRA_OPERA", -1 );
+            if ( key_type == 10027 ) {
+                if ( opera_type == 0 ) {
+                    mCameraMode.setSelected( false );
+                } else if ( opera_type == 1 ) {
+                    mCameraMode.setSelected( true );
+                }
+                mCameraMode.setText( getString( mCameraMode.isSelected() ? R.string.mode_car_up : R.string.mode_north_up ) );
+            } else if( key_type == 10021 ){
+                onStopNavi();
+            }
+        }) );
+        MogoEntranceButtons.save( ButtonIndex.BUTTON1, findViewById( R.id.module_entrance_id_button1 ) );
+        MogoEntranceButtons.save( ButtonIndex.BUTTON2, findViewById( R.id.module_entrance_id_button2 ) );
 
         mDisplayOverviewBounds = new Rect(
                 ResourcesHelper.getDimensionPixelSize(getContext(),
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 e144f7534d..0812fb9e2e 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
@@ -109,10 +109,7 @@ public class MapPresenter extends Presenter< MapView > implements
                 if ( key_type == 10027 ) {
                     if ( type == 0 ) {
                         onChangeTrafficMode( opera_type );
-                    } else if ( type == 1 ) {
-                        zoomMap( opera_type == 0 );
                     } else if ( type == 2 ) {
-//                        mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
                         onChangeCameraMode( opera_type );
                     }
                 } else if ( key_type == 10048 ) {
@@ -157,6 +154,7 @@ public class MapPresenter extends Presenter< MapView > implements
                                 mLauncher.backToLauncher( getContext() );
                             }
                         }, 500L );
+                        mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
                         return;
                     }
                     onStopNaviInternal();
@@ -183,6 +181,7 @@ public class MapPresenter extends Presenter< MapView > implements
                     mMogoMapService.getNavi( getContext() ).reCalculateRoute( config );
 
                 }
+                mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
             }
         };
 
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 84b2d61b22..ccaf71fc65 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
@@ -164,8 +164,8 @@ public class VoiceConstants {
 
     static {
         // 免唤醒
-//        sVoiceCmds.put( VoiceConstants.CMD_MAP_ZOOM_IN_UN_WAKEUP, VoiceConstants.CMD_MAP_ZOOM_IN_TRIGGER_WORDS );
-//        sVoiceCmds.put( VoiceConstants.CMD_MAP_ZOOM_OUT_UN_WAKEUP, VoiceConstants.CMD_MAP_ZOOM_OUT_TRIGGER_WORDS );
+        sVoiceCmds.put( VoiceConstants.CMD_MAP_ZOOM_IN_UN_WAKEUP, VoiceConstants.CMD_MAP_ZOOM_IN_TRIGGER_WORDS );
+        sVoiceCmds.put( VoiceConstants.CMD_MAP_ZOOM_OUT_UN_WAKEUP, VoiceConstants.CMD_MAP_ZOOM_OUT_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_2D_UN_WAKEUP, VoiceConstants.CMD_MAP_2D_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_3D_UN_WAKEUP, VoiceConstants.CMD_MAP_3D_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DAY_TIME_MODE_TRIGGER_WORDS );
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 1b8ab10d33..55eb757511 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
+import com.mogo.module.media.MediaConstants;
 import com.mogo.module.media.R;
 import com.mogo.module.media.ServiceMediaHandler;
 import com.mogo.module.media.constants.MusicConstant;
@@ -22,6 +23,8 @@ import com.mogo.module.media.view.IMusicView;
 import com.mogo.module.media.widget.AnimCircleImageView;
 import com.mogo.module.media.widget.NoScrollSeekBar;
 import com.mogo.module.media.widget.ScrollingTextView;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.WindowUtils;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
@@ -72,11 +75,20 @@ public class MediaWindow2 implements IMusicView {
             });
         }
 
+        ServiceMediaHandler.getIMogoStatusManager().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.ACC_STATUS, (descriptor, isTrue) -> {
+            if (descriptor == StatusDescriptor.ACC_STATUS&&!isTrue) {
+                ServiceMediaHandler.getMogoWindowManager().removeView(mWindowView);
+                mHasAddWindow = false;
+            }
+        });
+
        isFirstPlay = true;
     }
 
     private void addWindowView() {
+        Log.d(TAG, "addWindowView===" + mHasAddWindow);
         if (ServiceMediaHandler.getMogoWindowManager() == null) {
+            Log.d(TAG, "addWindowView return");
             return;
         }