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

[2.13.0] merge problem

Browse Source
This commit is contained in:
zhongchao
2022-11-21 20:51:10 +08:00
parent 5389db47c4
commit a18bc05194
5 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
View File

@@ -16,9 +16,8 @@ import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtilsNew
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.module.common.drawer.TrafficMarkerDrawer
import com.mogo.module.common.enums.EventTypeEnumNew
import com.mogo.module.common.enums.V2iEventTypeEnum
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.enums.V2iEventTypeEnum
import com.mogo.support.obu.MogoObuManager
import com.mogo.support.obu.OnMogoObuListener
import com.mogo.support.obu.constants.MogoObuComType
@@ -171,7 +170,7 @@ class MogoPrivateObuNewManager private constructor() {
// 更新数据，远车数据，之前要匹配uuid
TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(data)?.let {
TrafficMarkerDrawer.updateITrafficLocationInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficLocationInfo(it)
}
Log.d(TAG, data.toString())
@@ -337,7 +336,7 @@ class MogoPrivateObuNewManager private constructor() {
)
// 更新数据
TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficThreatLevelInfo(it)
}
}
// 删除
@@ -350,7 +349,7 @@ class MogoPrivateObuNewManager private constructor() {
TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
// 事件结束，还原车辆颜色
it.threatLevel = 0x01
TrafficMarkerDrawer.updateITrafficInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(it)
}
}
}
@@ -412,7 +411,7 @@ class MogoPrivateObuNewManager private constructor() {
// }
// 更新数据
TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)?.let {
TrafficMarkerDrawer.updateITrafficInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficInfo(it)
}
}
@@ -424,7 +423,7 @@ class MogoPrivateObuNewManager private constructor() {
TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data)?.let {
// 事件结束，还原交通参与者颜色
it.threatLevel = 0x01
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficThreatLevelInfo(it)
}
//TODO
// CallerHmiManager.disableWarningV2X(ObuConstants.USE_CASE_ID.VRUCW.toString())
@@ -619,7 +618,7 @@ class MogoPrivateObuNewManager private constructor() {
}
//更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficThreatLevelInfo(it)
}
}
// 删除
@@ -631,7 +630,7 @@ class MogoPrivateObuNewManager private constructor() {
//更新周边车辆进行预警颜色变换，车辆实时移动和变色
TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
it.threatLevel = 0x01
TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
CallerMapUIServiceManager.getMarkerService()?.updateITrafficThreatLevelInfo(it)
}
}
}