diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt index b57be53aff..fc19bb997b 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt @@ -16,12 +16,12 @@ class TrafficData { /** * 识别物体唯一标识 */ - var uuid: String = "" + var uuid: String? = "" /** * 车牌id */ - var carId: String = "" + var carId: String? = "" /** * 数据来源精度 0 - 普通定位、1 - 高精定位 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt index bdadc0aa11..ec55b65034 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt @@ -60,14 +60,18 @@ object TrafficMarkerDrawer { * 添加识别的数据 */ fun addTrafficInfo(trafficData: TrafficData) { - mTrafficMap[trafficData.uuid] = trafficData + if (trafficData.uuid != null) { + mTrafficMap[trafficData.uuid!!] = trafficData + } } /** * 更新识别数据,V2V预警的时候需要修改车辆颜色 */ fun updateITrafficInfo(trafficData: TrafficData) { - mTrafficMap[trafficData.uuid] = trafficData + if (trafficData.uuid != null) { + mTrafficMap[trafficData.uuid!!] = trafficData + } } /** @@ -79,9 +83,13 @@ object TrafficMarkerDrawer { tempTraffic.lat = trafficData.lat tempTraffic.lon = trafficData.lon tempTraffic.heading = trafficData.heading - mTrafficMap[trafficData.uuid] = tempTraffic + if (trafficData.uuid != null) { + mTrafficMap[trafficData.uuid!!] = tempTraffic + } } else { - mTrafficMap[trafficData.uuid] = trafficData + if (trafficData.uuid != null) { + mTrafficMap[trafficData.uuid!!] = trafficData + } } } @@ -95,9 +103,13 @@ object TrafficMarkerDrawer { tempTraffic.lon = trafficData.lon tempTraffic.heading = trafficData.heading tempTraffic.threatLevel = trafficData.threatLevel - mTrafficMap[trafficData.uuid] = tempTraffic + if (trafficData.uuid != null) { + mTrafficMap[trafficData.uuid!!] = tempTraffic + } } else { - mTrafficMap[trafficData.uuid] = trafficData + if (trafficData.uuid != null) { + mTrafficMap[trafficData.uuid!!] = trafficData + } } } @@ -195,7 +207,9 @@ object TrafficMarkerDrawer { // 缓存3D资源 mMarkerCachesResMd5Values[resIdVal] = marker.markerResName // 缓存数据 - mMarkersCaches[trafficData.uuid] = marker + if (trafficData.uuid != null) { + mMarkersCaches[trafficData.uuid!!] = marker + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt index 77e4195736..d8ae58050c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt @@ -103,7 +103,9 @@ class V2XMessageListener_404000 : IMogoOnMessageListener { TrafficMarkerDrawer.updateITrafficInfo(trafficData) } 3 -> { - TrafficMarkerDrawer.removeCvxRvInfoIndInfo(trafficData.uuid) + trafficData.uuid?.let { + TrafficMarkerDrawer.removeCvxRvInfoIndInfo(it) + } } } }