yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test_MogoAP_eagle-220_211207_8.0.15.1' into test_MogoAP_eagle-220_211207_8.0.15.1

Browse Source
This commit is contained in:
donghongyu
2021-12-14 18:45:30 +08:00
parent 73f7951b0e eeb342e1cf
commit a2a89895ff
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/traffic/TrafficData.kt
View File

@@ -16,12 +16,12 @@ class TrafficData {
/**
* 识别物体唯一标识
*/
var uuid: String = ""
var uuid: String? = ""
/**
* 车牌id
*/
var carId: String = ""
var carId: String? = ""
/**
* 数据来源精度 0 - 普通定位、1 - 高精定位

28
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
View File

@@ -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
}
}
}

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
View File

@@ -103,7 +103,9 @@ class V2XMessageListener_404000 : IMogoOnMessageListener<AdvanceWarningBean> {
TrafficMarkerDrawer.updateITrafficInfo(trafficData)
}
3 -> {
TrafficMarkerDrawer.removeCvxRvInfoIndInfo(trafficData.uuid)
trafficData.uuid?.let {
TrafficMarkerDrawer.removeCvxRvInfoIndInfo(it)
}
}
}
}