diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c1d72cebb5..29512bd868 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ android {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-                abiFilters 'armeabi-v7a'
+                abiFilters "armeabi-v7a"
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 03961736bf..316601007d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
 # v2x
-MOGO_MODULE_V2X_VERSION=1.1.531
+MOGO_MODULE_V2X_VERSION=1.1.534
 # 推送
 MOGO_MODULE_PUSH_VERSION=1.1.5.7
 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5
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 6cf876ad86..e2d83eb720 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
@@ -355,33 +355,27 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
                 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.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 c9872d1673..f05f600046 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
@@ -110,7 +110,6 @@ public class MapPresenter extends Presenter< MapView > implements
                     if ( type == 0 ) {
                         onChangeTrafficMode( opera_type );
                     } else if ( type == 2 ) {
-//                        mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
                         onChangeCameraMode( opera_type );
                     }
                 } else if ( key_type == 10048 ) {
@@ -181,6 +180,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-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 0f76bd5d6d..bfc00ab218 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;
@@ -70,11 +73,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;
         }