diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index a00bf8080a..d58e416597 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -157,6 +157,9 @@ enum class TrafficTypeEnum( TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type -> R.raw.v2x_shigong_warning + TYPE_TRAFFIC_ID_LUCE_TA_CHE.type -> R.raw.lucexiaoche + TYPE_TRAFFIC_ID_LUCE_BUS.type -> R.raw.lucedaba + TYPE_TRAFFIC_ID_LUCE_TRUCK.type -> R.raw.lucedaba else -> R.raw.traffic_xiankuang } } else { @@ -191,6 +194,9 @@ enum class TrafficTypeEnum( TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type -> R.raw.v2x_shigong_warning + TYPE_TRAFFIC_ID_LUCE_TA_CHE.type -> R.raw.lucexiaoche + TYPE_TRAFFIC_ID_LUCE_BUS.type -> R.raw.lucedaba + TYPE_TRAFFIC_ID_LUCE_TRUCK.type -> R.raw.lucedaba else -> R.raw.traffic_xiankuang } } else { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt index 5173b064ab..447b706eab 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt @@ -753,11 +753,11 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle ) addPreVehicleModelWeiZhi( TrafficTypeEnum.TYPE_TRAFFIC_ID_TRUCK, - "添加感知模型到地图中……preVehicleStrLuceTaChe=" + "添加感知模型到地图中……preVehicleStrTruck=" ) addPreVehicleModelWeiZhi( TrafficTypeEnum.TYPE_TRAFFIC_ID_LUCE_TA_CHE, - "添加感知模型到地图中……preVehicleStrTruck=" + "添加感知模型到地图中……preVehicleStrLuceTaChe=" ) addPreVehicleModelWeiZhi( TrafficTypeEnum.TYPE_TRAFFIC_ID_LUCE_BUS, 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 ec3a8aa112..4706f1d71a 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 @@ -137,21 +137,21 @@ public class ObjectUtils { markerOptions.setId(aiData.getUuid().hashCode()); markerOptions.setColor("#00FF00FF"); int type = aiData.getType(); -// if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && -// AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ -// if(type == 3){ -// type = 103; -// }else if(type == 6){ -// type = 106; -// }else if(type == 8){ -// type = 108; -// } -// if (type != 103 && type != 106 && type != 108) { -// markerOptions.setColor("#90ABCAFF"); -// }else{ -// markerOptions.setColor(""); -// } -// } + if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ + if(type == 3){ + type = 103; + }else if(type == 6){ + type = 106; + }else if(type == 8){ + type = 108; + } + if (type != 103 && type != 106 && type != 108) { + markerOptions.setColor("#90ABCAFF"); + }else{ + markerOptions.setColor(""); + } + } markerOptions.setMarkerType(type); markerOptions.setRotateAngle((float) aiData.getHeading()); markerOptions.setLat(aiData.getWgslat());