From 2c78c3d5cba2f75763ee9c6385b57fe3b6c5a056 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 25 May 2021 16:34:21 +0800 Subject: [PATCH] fix bug of merge --- .../src/main/java/com/mogo/map/MogoMarkerManager.java | 9 --------- .../java/com/mogo/module/common/drawer/BaseDrawer.java | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java index 5d21b7df80..96ec236ebf 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java @@ -109,13 +109,4 @@ public class MogoMarkerManager implements IMogoMarkerManager { // RouteOverlayHelper.getInstance().removeAll(); } - @Override - public void visibleAllMarkers() { - - } - - @Override - public void inVisibleAllMarkers() { - - } } 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 08a68ba08d..a9456f6794 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 @@ -25,10 +25,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ADAS; +import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_MY_LOCATION; import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_ADAS; import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_DATA; -import static com.mogo.realtime.entity.CloudRoadData.FROM_ADAS; -import static com.mogo.realtime.entity.CloudRoadData.FROM_MY_LOCATION; import static java.lang.Math.PI; public