diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
index 4eb76d1be3..b6645fa28c 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
@@ -30,7 +30,7 @@ public class ParamsUtil {
     public static Map< String, Object > getDynamicParams() {
         Map< String, Object > params = new ArrayMap();
 
-        final Map<String,Object> location = LocationHelper.getInstance().getLocationProperties();
+        final Map< String, Object > location = LocationHelper.getInstance().getLocationProperties();
         if ( location != null ) {
             params.putAll( location );
         }
@@ -71,7 +71,8 @@ public class ParamsUtil {
     public static Map< String, Object > getAnalyticsCustomParams() {
         Map< String, Object > map = new ArrayMap<>();
         map.put( "debug", DebugConfig.isDebug() ? 1 : 0 );
-        map.put( "systemversion", Utils.getFotaVersion() );
+        String fota = Utils.getFotaVersion();
+        map.put( "systemversion", TextUtils.isEmpty( fota ) ? DebugConfig.getProductFlavor() : fota );
         map.put( "sn", Utils.getSn() );
         return map;
     }
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 93f7e5fc2c..ab39bd41b2 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
@@ -240,9 +240,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));
         });
 
 
@@ -582,4 +582,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-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
index cb7fa6a938..caaf67dd12 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
@@ -63,8 +63,6 @@ public class MarkerServiceHandler {
     private static ICarsChattingProvider sCarChatting;
     private static IMogoGpsSimulatorManager sGpsSimulatorManager;
 
-    private static MapMarkerManager sMapMarkerManager;
-
     public static synchronized void init( final Context context ) {
 
         if ( sGpsSimulatorManager != null ) {
@@ -92,8 +90,7 @@ public class MarkerServiceHandler {
 
         sCarChatting = ( ICarsChattingProvider ) ARouter.getInstance().build( CallChattingProviderConstant.CAR_CALL_PROVIDER ).navigation( context );
 
-        sMapMarkerManager = MapMarkerManager.getInstance();
-        sMapMarkerManager.init( context );
+        MapMarkerManager.getInstance().init( context );
 
         sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
     }
@@ -143,7 +140,7 @@ public class MarkerServiceHandler {
     }
 
     public static MapMarkerManager getMapMarkerManager() {
-        return sMapMarkerManager;
+        return MapMarkerManager.getInstance();
     }
 
     public static IMogoRegisterCenter getRegisterCenter() {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index f641febd03..6c2493af4a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -77,6 +77,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
     private Rect mMarkerDisplayBounds;
 
     private MapMarkerManager() {
+        mContext = AbsMogoApplication.getApp();
     }
 
     public static synchronized MapMarkerManager getInstance() {
@@ -95,7 +96,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
      * @param context
      */
     public void init( Context context ) {
-        mContext = context;
         mRefreshModel = new RefreshModel( mContext );
 
         // 长连接
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
index 0a901e78ad..f1d36a428f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
@@ -194,9 +194,9 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
             tvDistance.setText(distance);
             SpanUtils.with(tvDistance)
                     .append("" + distance)
-                    .setFontSize(80)
+                    .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80))
                     .append("M")
-                    .setFontSize(30)
+                    .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30))
                     .create();
             tvEventTime.setText(eventTime);
         }
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 f0b7f152e4..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
@@ -98,9 +98,9 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
             }
             SpanUtils.with(mTvAddressDistance)
                     .append("" + (int) entity.getDistance())
-                    .setFontSize(80)
+                    .setFontSize((int) getResources().getDimension(R.dimen.dp_80))
                     .append("M")
-                    .setFontSize(30)
+                    .setFontSize((int) getResources().getDimension(R.dimen.dp_30))
                     .create();
             countDownV2XEvent(entity);
         }
@@ -157,7 +157,6 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
 
     @Override
     public void onCalculateSuccess() {
-        V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener( "test");
         V2XServiceManager.getNavi().startNavi(true);
     }