diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java
index a0bcb0467b..b85f792310 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java
@@ -245,6 +245,11 @@ public class AMapWrapper implements IMogoMap {
         return null;
     }
 
+    @Override
+    public String getMapVersion() {
+        return null;
+    }
+
     private boolean checkAMap() {
         if ( mAMap == null ) {
             Logger.e( TAG, "高德map实例为空，请检查" );
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
index f1e03b51d2..60e5f87475 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
@@ -263,6 +263,11 @@ public class AMapWrapper implements IMogoMap {
         return null;
     }
 
+    @Override
+    public String getMapVersion() {
+        return MapAutoApi.INSTANCE.getSDKVersion();
+    }
+
     private boolean checkAMap() {
         mAMap = mMapView.getMapAutoViewHelper();
         sAMap = mAMap;
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java
index 0cf8a64ecc..d75cd7c672 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java
@@ -142,4 +142,10 @@ public interface IMogoMap {
      * @return
      */
     IMogoPolyline addPolyline( MogoPolylineOptions options );
+
+    /**
+     * 获取地图版本号
+     * @return
+     */
+    String getMapVersion();
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
index 5b57f23f17..6bfb2e1f62 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
@@ -194,8 +194,9 @@ class BaseDrawer {
      * @return showSpeed
      */
     public boolean shouldShowSpeed(int type) {
-        AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
-        return recognizedType != AdasRecognizedType.classIdPerson;
+        return true; //todo 验证行人预警,对行人和自行车不做infoWindow过滤
+//        AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
+//        return recognizedType != AdasRecognizedType.classIdPerson;
 //                &&recognizedType != AdasRecognizedType.classIdBicycle //todo Bicycle显示
 //                && recognizedType != AdasRecognizedType.classIdMoto  //todo moto显示
     }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
index 4c219b8bf5..51a1030014 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -166,8 +166,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
 
         Map<String, IMogoMarker> newMarkersCaches = new ConcurrentHashMap<>(allDatumsList.size());
         List<SocketDownData.CloudRoadDataProto> newDiffSet = new ArrayList<>();
-
         for (SocketDownData.CloudRoadDataProto cloudRoadData : allDatumsList) {
+
             if (isUselessValue(cloudRoadData)) {
                 continue;
             }
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 e9240cbd8a..4b78c46ace 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
@@ -69,6 +69,7 @@ import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
 import com.mogo.module.extensions.utils.TopViewAnimHelper;
 import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
 import com.mogo.module.extensions.view.ArcView;
+import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.module.share.manager.ServiceApisManager;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.analytics.IMogoAnalytics;
@@ -98,6 +99,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
+import static android.content.Intent.ACTION_VIEW;
 import static com.mogo.module.common.utils.SPConst.getSPGuideRecord;
 import static com.mogo.module.common.utils.SPConst.getSpGuide;
 import static com.mogo.module.extensions.ExtensionsModuleConst.TYPE_ENTRANCE;
@@ -368,6 +370,16 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         flSpeed = (FrameLayout) findViewById(R.id.fl_speed);
         mouduleArc = (ArcView) findViewById(R.id.moudule_arc);
+        if (DebugConfig.isDebug()) {
+            mouduleArc.setLongClickable(true);
+            mouduleArc.setOnLongClickListener(v -> {
+                Log.d(TAG,"长按显示状态工具栏");
+                Intent intent = new Intent();
+                intent.putExtra("oper", 52);
+                MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent);
+                return true;
+            });
+        }
         clTrafficLight = (ConstraintLayout) findViewById(R.id.cl_traffic_light);
         tvYellow = (TextView) findViewById(R.id.tv_yellow);
         tvRed = (TextView) findViewById(R.id.tv_red);
@@ -392,53 +404,53 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     private Group groupFix;
 
     private void enterVrMode() {
-            tvEnterVrMode.setVisibility(View.GONE);
-            mMove2CurrentLocation.setVisibility(View.GONE);
-            mUploadRoadCondition.setVisibility(View.GONE);
-            mWeatherContainer.setVisibility(View.GONE);
-            mMsgContainer.setVisibility(View.GONE);
-            groupUserHead.setVisibility(View.GONE);
-            seekHelpGroup.setVisibility(View.GONE);
+        tvEnterVrMode.setVisibility(View.GONE);
+        mMove2CurrentLocation.setVisibility(View.GONE);
+        mUploadRoadCondition.setVisibility(View.GONE);
+        mWeatherContainer.setVisibility(View.GONE);
+        mMsgContainer.setVisibility(View.GONE);
+        groupUserHead.setVisibility(View.GONE);
+        seekHelpGroup.setVisibility(View.GONE);
 //        tvExitVrMode.setVisibility(View.VISIBLE);
-            TopViewAnimHelper.getInstance().enterVrMode();
-            TopViewNoLinkageAnimHelper.getInstance().enterVrMode();
-            mNaviInfo = vrModeNavInfoView;
-            adasNoticeHelper.enterVrMode();
-            mCameraLiveNoticeHelper.enterVrMode();
+        TopViewAnimHelper.getInstance().enterVrMode();
+        TopViewNoLinkageAnimHelper.getInstance().enterVrMode();
+        mNaviInfo = vrModeNavInfoView;
+        adasNoticeHelper.enterVrMode();
+        mCameraLiveNoticeHelper.enterVrMode();
 
-            MogoApisHandler.getInstance().getApis().getRegisterCenterApi()
-                    .registerCarLocationChangedListener(TAG, this);
+        MogoApisHandler.getInstance().getApis().getRegisterCenterApi()
+                .registerCarLocationChangedListener(TAG, this);
 
-            localIsVrMode = true;
-            flSpeed.setVisibility(View.VISIBLE);
-            mSwitchMapModeLayout.setVisibility(View.VISIBLE);
-            mApis.getV2XListenerManager().changeTipWindowStatusForListener(ACTION_V2X_REMOVE_TIP_WINDOW);
+        localIsVrMode = true;
+        flSpeed.setVisibility(View.VISIBLE);
+        mSwitchMapModeLayout.setVisibility(View.VISIBLE);
+        mApis.getV2XListenerManager().changeTipWindowStatusForListener(ACTION_V2X_REMOVE_TIP_WINDOW);
     }
 
     private void exitVrMode() {
-            EntranceViewHolder.getInstance().forceHideNoticeView();
-            tvEnterVrMode.setVisibility(View.VISIBLE);
-            mMove2CurrentLocation.setVisibility(View.VISIBLE);
-            mUploadRoadCondition.setVisibility(View.VISIBLE);
-            groupUserHead.setVisibility(View.VISIBLE);
-            if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isSeekHelping()) {
-                seekHelpGroup.setVisibility(View.VISIBLE);
-            }
+        EntranceViewHolder.getInstance().forceHideNoticeView();
+        tvEnterVrMode.setVisibility(View.VISIBLE);
+        mMove2CurrentLocation.setVisibility(View.VISIBLE);
+        mUploadRoadCondition.setVisibility(View.VISIBLE);
+        groupUserHead.setVisibility(View.VISIBLE);
+        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isSeekHelping()) {
+            seekHelpGroup.setVisibility(View.VISIBLE);
+        }
 //        mWeatherContainer.setVisibility(View.VISIBLE);
 //        mMsgContainer.setVisibility(View.VISIBLE);
 
 //        tvExitVrMode.setVisibility(View.GONE);
-            TopViewAnimHelper.getInstance().exitVrMode();
-            TopViewNoLinkageAnimHelper.getInstance().exitVrMode();
-            mNaviInfo = animNavInfoView;
-            adasNoticeHelper.exitVrMode();
-            mCameraLiveNoticeHelper.exitVrMode();
+        TopViewAnimHelper.getInstance().exitVrMode();
+        TopViewNoLinkageAnimHelper.getInstance().exitVrMode();
+        mNaviInfo = animNavInfoView;
+        adasNoticeHelper.exitVrMode();
+        mCameraLiveNoticeHelper.exitVrMode();
 
-            MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoLocationListener(TAG);
-            localIsVrMode = false;
-            flSpeed.setVisibility(View.GONE);
-            mSwitchMapModeLayout.setVisibility(View.GONE);
-            clTrafficLight.setVisibility(View.GONE);
+        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoLocationListener(TAG);
+        localIsVrMode = false;
+        flSpeed.setVisibility(View.GONE);
+        mSwitchMapModeLayout.setVisibility(View.GONE);
+        clTrafficLight.setVisibility(View.GONE);
     }
 
     private void debugCrashWarn() {
@@ -729,7 +741,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             // 进入鹰眼模式，设置手势缩放地图失效
             Logger.d(TAG, "进入vr模式");
             mMApUIController.changeMapMode(EnumMapUI.Type_VR);
-            MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
+            MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
         }
 
     }
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 3279798626..11a23d8898 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
@@ -148,7 +148,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             @Override
             public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) {
                 DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true);
-//                SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData);
+                SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData);
 //                Message msg = mSnapshotHandler.obtainMessage();
 //                msg.obj = mogoSnapshotSetData;
 //                msg.what = MSG_SNAPSHOT;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
index 2f33265028..cbf9254143 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
@@ -5,6 +5,7 @@ import android.graphics.Color;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -14,7 +15,6 @@ import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.module.service.R;
-import com.mogo.utils.AppUtils;
 import com.mogo.utils.NetworkUtils;
 
 import static com.mogo.utils.CommonUtils.getVersionName;
@@ -69,11 +69,11 @@ public class EnvStatusManager {
 
     private void renderStatus() {
         String[] sStatusName = {
-                "定位",
-                "近景",
-                "下发",
-                "AUTO",
-                "长链",
+                "工控机定位",
+                "ADAS近景感知",
+                "云端远景感知",
+                "自动驾驶状态",
+                "socket长链",
                 "经度",
                 "纬度",
                 "网络状态",
@@ -92,7 +92,10 @@ public class EnvStatusManager {
             } else if (i == 8) {
                 stringBuilder.append(getVersionName(mContext, "com.mogo.launcher.f")).append("\n");
             } else if (i == 9) {
-                stringBuilder.append(AppUtils.getCustomMapSDKVersion(mContext)).append("\n");
+                String mapVersion = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapVersion();
+                if (!TextUtils.isEmpty(mapVersion)) {
+                    stringBuilder.append(mapVersion).append("\n");
+                }
             } else {
                 stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n");
             }
@@ -108,10 +111,6 @@ public class EnvStatusManager {
                 mStatusTv.setTextColor(Color.WHITE);
             }
         }
-
-        //添加网络状态
-
-        //
     }
 
     private Context mContext;
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java
index 770dcbfa8a..b2728c24ae 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java
@@ -144,4 +144,10 @@ public interface IMogoMapService extends IProvider {
      * @return
      */
     CoordinatesTransformer getCoordinatesTransformer();
+
+    /**
+     * 获取地图版本号
+     * @return
+     */
+    String getMapVersion();
 }
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
index be40cc27ed..db2d0c4332 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
@@ -46,7 +46,7 @@ public class IntentManager implements IMogoIntentManager {
         sInstance = null;
     }
 
-    private Map< String, CopyOnWriteArrayList< IMogoIntentListener > > mListeners = new ConcurrentHashMap<>();
+    private final Map< String, CopyOnWriteArrayList< IMogoIntentListener > > mListeners = new ConcurrentHashMap<>();
 
     @Override
     public void registerIntentListener( String intent, IMogoIntentListener listener ) {
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java
index 6bf52684a8..b3aeb3065a 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java
@@ -10,6 +10,7 @@ import com.mogo.map.MogoCoordinatesTransformer;
 import com.mogo.map.MogoGeoSearch;
 import com.mogo.map.MogoInputtipsSearch;
 import com.mogo.map.MogoLocationClient;
+import com.mogo.map.MogoMap;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.map.MogoMapViewInstanceHandler;
 import com.mogo.map.MogoMarkerManager;
@@ -120,6 +121,11 @@ public class MogoMapService implements IMogoMapService {
         return MogoCoordinatesTransformer.getInstance();
     }
 
+    @Override
+    public String getMapVersion() {
+        return MogoMap.getInstance().getMogoMap().getMapVersion();
+    }
+
     @Override
     public void init( Context context ) {
     }