From 66c98a3094af8db472a56e96b029d3bc84817737 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 29 Jul 2020 19:09:12 +0800
Subject: [PATCH] bugfix: E85XJD-107

---
 .../extensions/entrance/EntranceFragment.java | 42 ++++++++-----------
 .../com/mogo/module/map/MapPresenter.java     |  2 +-
 2 files changed, 19 insertions(+), 25 deletions(-)

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 e144f7534d..85bc1bf0f0 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
@@ -112,7 +112,6 @@ public class MapPresenter extends Presenter< MapView > implements
                     } 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 ) {
@@ -183,6 +182,7 @@ public class MapPresenter extends Presenter< MapView > implements
                     mMogoMapService.getNavi( getContext() ).reCalculateRoute( config );
 
                 }
+                mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
             }
         };