From 4718e69188bfec0bc712bc499227fabf139c3d92 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Wed, 4 Sep 2024 18:19:10 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0][=E5=90=AF=E8=87=AA=E9=A9=BE=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA]=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../status/StatusManager.kt                        |  2 +-
 .../autopilot/CallerAutoPilotControlManager.kt     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt
index 2478d60c16..b012964210 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt
@@ -214,6 +214,7 @@ object StatusManager {
                                             is DoubleFlashStatus -> "双闪"
                                             is GearStatus -> "档位"
                                             is RouteDownloadStatus -> if (item.state == RouteStart) "轨迹下载中" else "轨迹下载失败"
+                                            is FSMStatus -> "FSM"
                                             else -> "其它"
                                         }
                                     }
@@ -239,7 +240,6 @@ object StatusManager {
                 } else  {
                     ret or shl
                 }
-
             }
         }
         return ret
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
index 67b52878b9..8cea2c18f2 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
@@ -105,22 +105,22 @@ object CallerAutoPilotControlManager {
             if (isShowTip) {
                 val sb = StringBuilder("请检查车辆")
                 if ((exceptionValue and 1) != 0) {
+                    sb.append("FSM$")
+                }
+                if ((exceptionValue and (1 shl 1)) != 0) {
                     sb.append("方向盘$")
                 }
-                if (((exceptionValue and (1 shl 1)) != 0)) {
+                if (((exceptionValue and (1 shl 2)) != 0)) {
                     sb.append("油门$")
                 }
-                if ((exceptionValue and (1 shl 2)) != 0) {
+                if ((exceptionValue and (1 shl 3)) != 0) {
                     sb.append("刹车$")
                 }
-                if ((exceptionValue and (1 shl 3)) != 0) {
+                if ((exceptionValue and (1 shl 4)) != 0) {
                     sb.append("双闪$")
                 }
-                if ((exceptionValue and (1 shl 4)) != 0) {
-                    sb.append("档位$")
-                }
                 if ((exceptionValue and (1 shl 5)) != 0) {
-                    sb.append("FSM$")
+                    sb.append("档位$")
                 }
                 if ((exceptionValue and (1 shl 6)) != 0 || ((exceptionValue and (1 shl 7)) != 0)) {
                     if (!sb.contains("$")) {