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

Merge remote-tracking branch 'origin/dev/dev_eagle_wuhan_sikua_obu' into dev/dev_eagle_wuhan_sikua_obu

Browse Source
This commit is contained in:
董宏宇
2021-09-08 16:09:56 +08:00
parent 0ea3339d0f ac3a67c63d
commit 6f2a9c2ddb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,7 +552,7 @@ class MogoPrivateObuManager private constructor() {
// 这里排除需要特殊定制的语音及文案外,其余的都可以使用 WarningTypeEnum 提供的
Log.d(
MogoObuConst.TAG_MOGO_OBU,
"handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
"handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
)
var alertContent = ""
var ttsContent = ""
@@ -615,7 +615,7 @@ class MogoPrivateObuManager private constructor() {
// }
}
//盲区预警 TODO
//盲区预警
WarningTypeEnum.TYPE_USECASE_ID_BSW.useCaseId -> {
ttsContent = WarningTypeEnum.getWarningTts(appId)
alertContent = WarningTypeEnum.getWarningContent(appId)
@@ -646,7 +646,7 @@ class MogoPrivateObuManager private constructor() {
//显示弹框，语音提示
Log.d(
MogoObuConst.TAG_MOGO_OBU,
"appId = $appId --- level = $level --- alertContent = $alertContent"
"appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent"
)
mIMoGoWaringProvider!!.showWarningV2X(
appId,

4
modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt
View File

@@ -20,8 +20,8 @@ object TrafficDataConvertUtils {
* OBU 远车 转换交通元素数据
*/
fun cvxRvInfoIndInfo2TrafficData(info: CvxRvInfoIndInfo): TrafficData? {
if (info.basic_info == null || info.basic_info.position == null || info.threat_infos != null) {
Logger.e(TAG, "数据转换异常，请检查参数是否齐全")
if (info.basic_info == null || info.basic_info.position == null || info.threat_infos == null) {
Logger.e(TAG, "cvxRvInfoIndInfo2TrafficData 数据转换异常，请检查参数是否齐全")
return null
}
val trafficData = TrafficData()