diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java index b3bfae3c17..dd9dadb57c 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java @@ -38,18 +38,18 @@ import prediction2025.Prediction2025; */ public class ObjectUtils { - private static Map sTypeMap = Map.of( - Adas.TrackedObjectType.TYPE_PEDESTRIAN, Adas.TrackedObjectClassID.Person, - Adas.TrackedObjectType.TYPE_MOTOR, Adas.TrackedObjectClassID.MotorCycle, - Adas.TrackedObjectType.TYPE_BICYCLE, Adas.TrackedObjectClassID.Bicycle, - Adas.TrackedObjectType.TYPE_CAR, Adas.TrackedObjectClassID.Car, - Adas.TrackedObjectType.TYPE_TRUCK, Adas.TrackedObjectClassID.Truck, - Adas.TrackedObjectType.TYPE_BUS, Adas.TrackedObjectClassID.Bus, - Adas.TrackedObjectType.TYPE_WARNINGTRIANGLE, Adas.TrackedObjectClassID.WarningTriangle, - Adas.TrackedObjectType.TYPE_ROADWORK_OCCUPY_0501, Adas.TrackedObjectClassID.RoadWork_occupy_0501, - Adas.TrackedObjectType.TYPE_ROADWORK_BREAK_0502, Adas.TrackedObjectClassID.RoadWork_break_0502, - Adas.TrackedObjectType.TYPE_ROAD_CONGESTION, Adas.TrackedObjectClassID.ROAD_CONGESTION - ); +// private static Map sTypeMap = Map.of(//最低得JDK9,注意换成new HashMap<> +// Adas.TrackedObjectType.TYPE_PEDESTRIAN, Adas.TrackedObjectClassID.Person, +// Adas.TrackedObjectType.TYPE_MOTOR, Adas.TrackedObjectClassID.MotorCycle, +// Adas.TrackedObjectType.TYPE_BICYCLE, Adas.TrackedObjectClassID.Bicycle, +// Adas.TrackedObjectType.TYPE_CAR, Adas.TrackedObjectClassID.Car, +// Adas.TrackedObjectType.TYPE_TRUCK, Adas.TrackedObjectClassID.Truck, +// Adas.TrackedObjectType.TYPE_BUS, Adas.TrackedObjectClassID.Bus, +// Adas.TrackedObjectType.TYPE_WARNINGTRIANGLE, Adas.TrackedObjectClassID.WarningTriangle, +// Adas.TrackedObjectType.TYPE_ROADWORK_OCCUPY_0501, Adas.TrackedObjectClassID.RoadWork_occupy_0501, +// Adas.TrackedObjectType.TYPE_ROADWORK_BREAK_0502, Adas.TrackedObjectClassID.RoadWork_break_0502, +// Adas.TrackedObjectType.TYPE_ROAD_CONGESTION, Adas.TrackedObjectClassID.ROAD_CONGESTION +// ); public static MarkerOptions fromMogo(Point.Options opt, MapAutoView mapAutoView) { @@ -226,10 +226,7 @@ public class ObjectUtils { if (type == null) { type = Adas.TrackedObjectType.TYPE_UNKNOWN; } - Adas.TrackedObjectClassID classID = sTypeMap.get(type); - if (classID == null) { - classID = Adas.TrackedObjectClassID.Unknown; - } + Adas.TrackedObjectClassID classID = Adas.TrackedObjectClassID.Unknown; return classID.getNumber(); }