diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java index 96746a0322..f1c733afc2 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java @@ -20,9 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; - /** * 道路V2X事件的Marker */ @@ -40,16 +37,14 @@ public class V2XRoadEventMarker implements IV2XMarker { if (isAiRoadEvent(entity.getPoiType())) { MarkerExploreWay noveltyInfo = entity.getNoveltyInfo(); V2XBizTrace.Companion.onAck("V2XRoadEventMarker -> noveltyInfo : ",noveltyInfo.toString()); - if (noveltyInfo != null) { - Pair gpsLocation = noveltyInfo.getGpsLocation(); - List> polygons = noveltyInfo.getPolygon(); - if (gpsLocation != null && polygons != null) { - MarkerLocation location = noveltyInfo.getLocation(); - AiRoadMarker.Marker m = new AiRoadMarker.Marker(noveltyInfo.getInfoId(), noveltyInfo.getPoiType(), gpsLocation.second, gpsLocation.first, location.getAngle(), polygons, null, entity); - AiRoadMarker aiMarker = new AiRoadMarker(); - aiMarker.marker(m, true, isDrawRoadLine(m.getPoiType())); - AiRoadMarker.aiMakers.put(noveltyInfo.getInfoId(), aiMarker); - } + Pair gpsLocation = noveltyInfo.getGpsLocation(); + List> polygons = noveltyInfo.getPolygon(); + if (gpsLocation != null && polygons != null) { + MarkerLocation location = noveltyInfo.getLocation(); + AiRoadMarker.Marker m = new AiRoadMarker.Marker(noveltyInfo.getInfoId(), noveltyInfo.getPoiType(), gpsLocation.second, gpsLocation.first, location.getAngle(), polygons, null, entity); + AiRoadMarker aiMarker = new AiRoadMarker(); + aiMarker.marker(m, true, isDrawRoadLine(m.getPoiType())); + AiRoadMarker.aiMakers.put(noveltyInfo.getInfoId(), aiMarker); } } else { IMogoMarker iMarker = marker.drawableAlarmPOI(BridgeApi.INSTANCE.context(), entity, null); @@ -72,9 +67,9 @@ public class V2XRoadEventMarker implements IV2XMarker { private boolean isAiRoadEvent(String poiType) { return Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.getPoiType()) - && Objects.equals(poiType, EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType()) - && Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.getPoiType()) - && Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType()); + || Objects.equals(poiType, EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType()) + || Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.getPoiType()) + || Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType()); } private boolean isDrawRoadLine(String poiType) {