diff --git a/README.md b/README.md index 0cdcca9513..a5b02adccb 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,9 @@ adb shell am broadcast -a com.hmi.v2x.trafficlight --ez trafficLightIsShow false adb shell am broadcast -a com.hmi.v2x.limitingvelocity --ez limitingVelocityIsShow true --ei limitingVelocitySpeed 60 adb shell am broadcast -a com.hmi.v2x.limitingvelocity --ez limitingVelocityIsShow false -// 控制OBU场景自测 obuStates 1-添加,2-删除,0-更新 -adb shell am broadcast -a com.obu.test_trigger --ei obuStates 1 --ei obuLevel 3 --ei obuType 0x2A01 +// 控制OBU场景自测 obuStates 1-添加,2-删除,0-更新 ,obuEventDirection 事件方向 +adb shell am broadcast -a com.obu.test_trigger --ei obuStates 1 --ei obuLevel 3 --ei obuType 0x2A01 --ei obuEventDirection 0x11 + // 控制OBU 模拟自车位置 adb shell am broadcast -a com.obu.test_trigger_recognized diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java index b284e3564c..75ca9f41ff 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java @@ -25,5 +25,7 @@ public class MogoObuConst { public static String BROADCAST_PTC_INFO_EXTRA_KEY = "ptcInfo"; //道路交通信息类型 0x0--0x17 public static String BROADCAST_RTI_TYPE_EXTRA_KEY = "rtiType"; + //道路交通信息触发方向 0x11--0x47 + public static String BROADCAST_OBU_EVENT_DIRECTION_EXTRA_KEY = "obuEventDirection"; } diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index b0a72bc535..33f447988a 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -440,7 +440,7 @@ class MogoPrivateObuManager private constructor() { ObuConstants.TARGET_CLASSIFICATION.TC_BEHIND_IN_LANE, 0x05 -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方 - 0x02 -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正左方 + 0x02 -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方 ObuConstants.TARGET_CLASSIFICATION.TC_AHEAD_LEFT, ObuConstants.TARGET_CLASSIFICATION.TC_AHEAD_FAR_LEFT, diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt index 7731204d0a..a603ed5f22 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuTestTriggerReceiver.kt @@ -35,8 +35,10 @@ class ObuTestTriggerReceiver : BroadcastReceiver() { val obuType = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_TYPE_EXTRA_KEY, 0) val obuStatus = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_STATES_EXTRA_KEY, 0) val obuLevel = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_LEVEL_EXTRA_KEY, 3) + val obuDirection = + intent.getIntExtra(MogoObuConst.BROADCAST_OBU_EVENT_DIRECTION_EXTRA_KEY, 0x11) Logger.d( - TAG, "obuType:$obuType obuStatus:$obuStatus" + TAG, "obuType:$obuType obuStatus:$obuStatus obuDirection$obuDirection" ) when (obuType) { @@ -54,8 +56,7 @@ class ObuTestTriggerReceiver : BroadcastReceiver() { val v2vThreatExt = V2vThreatExt( - 1, 1, - ObuConstants.TARGET_CLASSIFICATION.TC_BEHIND_FAR_RIGHT, 1, 1 + 1, 1, obuDirection, 1, 1 ) cvxV2vThreatIndInfo.ext_info = v2vThreatExt cvxV2vThreatIndInfo.status = obuStatus