From 839eab0eaf264d7d6dcf376c18851b7adec23d59 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 28 Jul 2020 20:44:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E4=B8=AD=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=BD=A6=E5=A4=B4=E5=92=8C=E6=AD=A3=E5=8C=97=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=20v2x=20=E7=96=B2=E5=8A=B3?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=9C=BA=E6=99=AF=E6=97=A0=E6=B3=95=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/map/impl/amap/AMapNaviViewWrapper.java   |  1 +
 .../extensions/entrance/EntranceFragment.java     | 15 ++++++++++++---
 .../scene/fatigue/V2XFatigueDrivingWindow.java    |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
index b02cbfaee4..aef3a1b430 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -321,6 +321,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
     @Override
     public void onNaviMapMode( int mode ) {
         Logger.i( TAG, "mode=" + mode );
+        MogoMapListenerHandler.getInstance().onMapModeChanged( mode == 0 ? EnumMapUI.CarUp_2D : EnumMapUI.NorthUP_2D );
     }
 
     @Override
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..6246462783 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,9 +239,9 @@ 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));
         });
 
 
@@ -585,4 +585,13 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             });
         });
     }
+
+    @Override
+    public void onMapModeChanged( EnumMapUI ui ) {
+        if ( mCameraMode == null ) {
+            return;
+        }
+        mCameraMode.setSelected(ui == EnumMapUI.NorthUP_2D);
+        mCameraMode.setText(getString(ui == EnumMapUI.NorthUP_2D ? R.string.mode_car_up : R.string.mode_north_up));
+    }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
index b4249e3355..56d0adf348 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
@@ -157,7 +157,6 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
 
     @Override
     public void onCalculateSuccess() {
-        V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener( "test");
         V2XServiceManager.getNavi().startNavi(true);
     }