From 0fee11cb5e71491b44bb33b3fddba39d9148b7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Sun, 23 Feb 2020 15:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91=20=E5=9C=A8?=
 =?UTF-8?q?=E8=BE=85=E5=8A=A9=E9=A9=BE=E9=A9=B6=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E6=B4=BB=E8=B7=83=E8=BD=A6=E6=9C=BA=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E7=82=B9=E5=9C=A8=E6=B8=85=E9=99=A4=E6=8E=89=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E4=BD=BF=E7=94=A8=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/service/marker/MapMarkerManager.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

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 055ae2a3f7..1e0629f6d2 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
@@ -339,22 +339,14 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
                 isFirstMarker = true;
             } else {
                 // 清空所有地图上绘制的Marker
-                if (!MarkerServiceHandler.getMogoStatusManager().isV2XShow()) {
-                    MarkerServiceHandler.getMarkerManager().removeMarkers();
-                }
+                MarkerServiceHandler.getMarkerManager().removeMarkers();
             }
 
             List<MarkerOnlineCar> onlineCarList = markerCardResult.getOnlineCar();
-            List<MarkerExploreWay> exploreWayList = null;
-            List<MarkerShareMusic> shareMusicList = null;
-            List<MarkerNoveltyInfo> noveltyInfoList = null;
+            List<MarkerExploreWay> exploreWayList = markerCardResult.getExploreWay();
+            List<MarkerShareMusic> shareMusicList = markerCardResult.getShareMusic();
+            List<MarkerNoveltyInfo> noveltyInfoList = markerCardResult.getNoveltyInfo();
 
-            // V2X 场景下只保留在线车辆数据
-            if (!MarkerServiceHandler.getMogoStatusManager().isV2XShow()) {
-                exploreWayList = markerCardResult.getExploreWay();
-                shareMusicList = markerCardResult.getShareMusic();
-                noveltyInfoList = markerCardResult.getNoveltyInfo();
-            }
             if (onlineCarList != null) {
                 double nearlyDistance = Float.MAX_VALUE;
                 for (MarkerOnlineCar markerOnlineCar : onlineCarList) {