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

[2.13.2] 合并EventTypeEnumNew，去掉obu默认关闭的开关

Browse Source
This commit is contained in:
lixiaopeng
2023-01-10 11:52:09 +08:00
parent d30ba10bff
commit 9cc44d9d51
25 changed files with 252 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,7 @@ class MogoPrivateObuManager private constructor() {
// (3) 道路事件预警信息：CVX_RTI_THREAT_IND
override fun onCvxRtiThreatIndInfo(info: CvxRtiThreatIndInfo?) {
if (HmiBuildConfig.isShowObuV2iView) {
// if (HmiBuildConfig.isShowObuV2iView) {
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
"onCvxRtiThreatIndInfo ------> $info"
@@ -433,8 +433,7 @@ class MogoPrivateObuManager private constructor() {
}
}
}
}
// }
}
// (4) V2I预警信息：CVX_IVP_THREAT_IND，红绿灯
@@ -448,20 +447,20 @@ class MogoPrivateObuManager private constructor() {
&& info.ext_info.lights != null
&& info.ext_info.lights.isNotEmpty()
) {
if (HmiBuildConfig.isShowObuV2iView) {
// if (HmiBuildConfig.isShowObuV2iView) {
handlerTrafficLight(
info.threat_info.app_id,
info.status,
info.ext_info.lights,
info.ext_info.index
)
}
// }
}
}
// (2) 弱势交通参与者预警信息：CVX_PTC_THREAT_IND
override fun onCvxPtcThreatIndInfo(info: CvxPtcThreatIndInfo?) {
if (HmiBuildConfig.isShowObuV2iView) {
// if (HmiBuildConfig.isShowObuV2iView) {
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
"onCvxPtcInfoIndInfo ------> $info"
@@ -559,7 +558,7 @@ class MogoPrivateObuManager private constructor() {
}
}
}
// }
}
// (5) 限速预警信息：CVX_SLW_THREAT_IND
@@ -592,7 +591,7 @@ class MogoPrivateObuManager private constructor() {
// (1) V2V预警信息：CVX_V2V_THREAT_IND
override fun onCvxV2vThreatIndInfo(info: CvxV2vThreatIndInfo?) {
if (HmiBuildConfig.isShowObuV2vView) {
// if (HmiBuildConfig.isShowObuV2vView) {
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
"onCvxV2vThreatIndInfo ------> $info"
@@ -620,7 +619,7 @@ class MogoPrivateObuManager private constructor() {
}
}
}
}
// }
}
/**

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

@@ -171,7 +171,7 @@ class MogoPrivateObuNewManager private constructor() {
*/
override fun onMogoObuRvWarning(data: MogoObuRvWarningData) {
super.onMogoObuRvWarning(data)
if (HmiBuildConfig.isShowObuV2vView) {
// if (HmiBuildConfig.isShowObuV2vView) { //TODO 临时需要关闭v2v开关
mObuStatusInfo.obuRvStatus = true
CallerObuListenerManager.invokeListener(mObuStatusInfo)
@@ -211,7 +211,7 @@ class MogoPrivateObuNewManager private constructor() {
}
}
}
}
// }
}
/**
@@ -221,13 +221,13 @@ class MogoPrivateObuNewManager private constructor() {
super.onMogoObuSpatWarning(data)
if (data?.lights != null && data.lights.isNotEmpty()
) {
if (HmiBuildConfig.isShowObuV2iView) {
// if (HmiBuildConfig.isShowObuV2iView) {
handlerTrafficLight(
data.warningType,
data.status,
data.lights
)
}
// }
}
}
@@ -236,7 +236,7 @@ class MogoPrivateObuNewManager private constructor() {
*/
override fun onMogoObuRsiWarning(data: MogoObuRsiWarningData) {
super.onMogoObuRsiWarning(data)
if (HmiBuildConfig.isShowObuV2iView) {
// if (HmiBuildConfig.isShowObuV2iView) {
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
"onMogoObuRsiWarning ------> $data"
@@ -469,8 +469,7 @@ class MogoPrivateObuNewManager private constructor() {
}
}
}
}
// }
}
/**
@@ -486,7 +485,7 @@ class MogoPrivateObuNewManager private constructor() {
data: MogoObuRsmWarningData?
) {
super.onMogoObuRsmWarning(data)
if (HmiBuildConfig.isShowObuV2iView) {
// if (HmiBuildConfig.isShowObuV2iView) {
if (HmiBuildConfig.isShowObuWeaknessTrafficView) {
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
@@ -587,7 +586,7 @@ class MogoPrivateObuNewManager private constructor() {
}
}
}
}
// }
}
/**