diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt index 971eec6f0b..fd1091cfa4 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -36,16 +36,14 @@ object V2XAiRoadEventMarker { fun drawMarkers(entity: V2XRoadEventEntity): Pair?>? { removeMarkers(current.get()) timerTask.get()?.cancel() - val extra = entity.noveltyInfo.extras.get("polygon"); + val extra = entity.noveltyInfo.extras["polygon"] if (extra is List<*>) { - val l = extra - if (l.size > 0) { + if (extra.size > 0) { val polygons: MutableList> = ArrayList() - for (i in l.indices) { - val o = l[i]!! as? androidx.core.util.Pair<*, *> ?: continue - val p = o - val first = p.first - val second = p.second + for (i in extra.indices) { + val o = extra[i]!! as? androidx.core.util.Pair<*, *> ?: continue + val first = o.first + val second = o.second if (first == null || second == null) { continue } @@ -63,7 +61,7 @@ object V2XAiRoadEventMarker { options.anchor(0.5f, 0.5f) options.icon3DRes(raw.sanjiaozhui) try { - val marker = MogoMarkerManager.getInstance(context()).addMarker("road_pyramid_" + entity.getPoiType(), options) + val marker = MogoMarkerManager.getInstance(context()).addMarker("road_pyramid_" + entity.poiType, options) markers += marker } catch (t: Throwable) { t.printStackTrace() @@ -87,7 +85,7 @@ object V2XAiRoadEventMarker { if (points.size > 2) { points.add(points[0]) } - options.points(points); + options.points(points) options.useGradient(true) options.useFacade(true) options.setGps(false) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt index 66da21999d..8f2350f31b 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt @@ -619,7 +619,7 @@ enum class EventTypeEnum( fun getMarker3DRes(poiType: String?): Int { return when (poiType) { FOURS_BLOCK_UP.poiType -> R.raw.v2x_yongdu - FOURS_ACCIDENT.poiType -> R.raw.v2x_shigu + FOURS_ACCIDENT.poiType,FOURS_ACCIDENT_04.poiType -> R.raw.v2x_shigu FOURS_LIVING.poiType -> R.raw.v2x_shishilukuang FOURS_FOG.poiType -> R.raw.v2x_nongwu TRAFFIC_CHECK.poiType -> R.raw.v2x_jiaotongjiancha