From 56372aba6897d2e054b25a540848dfb5fade1ada Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 6 Jan 2025 15:09:45 +0800 Subject: [PATCH] =?UTF-8?q?[6.9.0][Opt]=E8=BD=A6=E9=BE=99=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/vehicle/PncActionsView.kt | 6 ++++++ .../core/data/autopilot/pnc/PncActionsHelper.kt | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt index 5da0bc4f42..ef6e9f2562 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt @@ -115,6 +115,12 @@ class PncActionsView @JvmOverloads constructor( e.printStackTrace() } } + planningActionMsg.v2NActionMsgList?.forEach { v2nAction -> + actions = PncActionsHelper.getAction( + v2nAction.drivingState.number, + v2nAction.drivingAction.number + ) + } // update view if (actions.isNullOrEmpty()) { tvHmiPncActions.background = null diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt index d8adb85699..60a8a91e86 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt @@ -98,6 +98,18 @@ class PncActionsHelper { OUT_OF_ODD_VALUE -> { if (driveAction == 1 || driveAction == 2 || driveAction == 3) "已超出ODD" else "" } + LANE_FOLLOW_VEHICLE_STREAM_VALUE -> { + "正在跟车行驶" + } + LANE_CHANGE_LEFT_VEHICLE_STREAM_VALUE -> { + "正在向左变道避让前方车龙" + } + LANE_CHANGE_RIGHT_VEHICLE_STREAM_VALUE -> { + "正在向右变道避让前方车龙" + } + USING_RSI_LINK_VALUE -> { + "正在使用云端规划通过路口" + } else -> "" } }