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

修复他车颜色

Browse Source
This commit is contained in:
董宏宇
2021-09-10 15:43:40 +08:00
committed by chenfufeng
parent 55577b52ce
commit 2831976c0f
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,35 @@ object TrafficMarkerDrawer {
mTrafficMap[trafficData.uuid] = trafficData
}
/**
* 更新识别数据位置
*/
fun updateITrafficLocationInfo(trafficData: TrafficData) {
val tempTraffic = mTrafficMap[trafficData.uuid]
if (tempTraffic != null) {
tempTraffic.lat = trafficData.lat
tempTraffic.lon = trafficData.lon
mTrafficMap[trafficData.uuid] = tempTraffic
} else {
mTrafficMap[trafficData.uuid] = trafficData
}
}
/**
* 更新识别数据颜色
*/
fun updateITrafficThreatLevelInfo(trafficData: TrafficData) {
val tempTraffic = mTrafficMap[trafficData.uuid]
if (tempTraffic != null) {
tempTraffic.lat = trafficData.lat
tempTraffic.lon = trafficData.lon
tempTraffic.threatLevel = trafficData.threatLevel
mTrafficMap[trafficData.uuid] = tempTraffic
} else {
mTrafficMap[trafficData.uuid] = trafficData
}
}
/**
* 移除识别的数据
*/
@@ -113,7 +142,10 @@ object TrafficMarkerDrawer {
* 绘制单条
*/
private fun drawObuRecognizedDataMarker(trafficData: TrafficData) {
Logger.d("MogoObu", "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel)
Logger.d(
"MogoObu",
"drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
)
if (trafficData.type != null) {
val resId: Int = trafficData.type.traffic3DIconId

10
modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -149,7 +149,7 @@ class MogoPrivateObuManager private constructor() {
mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", true) }
// 更新数据
TrafficDataConvertUtils.cvxRvInfoIndInfo2TrafficData(info)?.let {
TrafficMarkerDrawer.updateITrafficInfo(it)
TrafficMarkerDrawer.updateITrafficLocationInfo(it)
}
}
@@ -349,7 +349,7 @@ class MogoPrivateObuManager private constructor() {
TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let {
// 事件结束，还原交通参与者颜色
it.threatLevel = 0x01
TrafficMarkerDrawer.updateITrafficInfo(it)
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
}
mIMoGoWaringProvider?.disableWarningV2X(ObuConstants.USE_CASE_ID.VRUCW.toString())
}
@@ -357,7 +357,7 @@ class MogoPrivateObuManager private constructor() {
else -> {
// 更新数据
TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let {
TrafficMarkerDrawer.updateITrafficInfo(it)
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
}
}
}
@@ -693,7 +693,7 @@ class MogoPrivateObuManager private constructor() {
//更新周边车辆进行预警颜色变换，车辆实时移动和变色
TrafficDataConvertUtils.cvxV2vThreatIndInfo2TrafficData(info)?.let {
it.threatLevel = 0x01
TrafficMarkerDrawer.updateITrafficInfo(it)
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
}
}
// 更新
@@ -704,7 +704,7 @@ class MogoPrivateObuManager private constructor() {
}
//更新周边车辆进行预警颜色变换，车辆实时移动和变色
TrafficDataConvertUtils.cvxV2vThreatIndInfo2TrafficData(info)?.let {
TrafficMarkerDrawer.updateITrafficInfo(it)
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
}
}
}