From 74da2a0e59b5dd474b72546e01e04293da05b29f Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 18 Apr 2024 17:38:13 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0][=E5=90=AF=E8=87=AA=E9=A9=BE=E6=8C=87?= =?UTF-8?q?=E5=BC=95]=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 | 13 +++++++++++-- .../status/entity/Status.kt | 3 ++- .../status/model/StatusModel.kt | 2 +- .../call/autopilot/CallerAutoPilotControlManager.kt | 5 +++++ 4 files changed, 19 insertions(+), 4 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 e87f41342b..53ad30dd23 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 @@ -19,7 +19,7 @@ import com.zhjt.mogo_core_function_devatools.status.entity.RTKStatus import com.zhjt.mogo_core_function_devatools.status.entity.Status import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus import com.zhjt.mogo_core_function_devatools.status.entity.* -//import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus +import com.zhjt.mogo_core_function_devatools.status.entity.RouteState.RouteStart //import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus import com.zhjt.mogo_core_function_devatools.status.model.StatusModel import com.zhjt.mogo_core_function_devatools.status.flow.IFlow import com.zhjt.mogo_core_function_devatools.status.flow.OverViewImpl @@ -186,7 +186,16 @@ object StatusManager { }?.forEachIndexed { index, status -> val shl = 1 shl index if (status.isException()) { - ret = ret or shl + ret = if (status is RouteDownloadStatus) { + if (status.state == RouteStart) { + ret or shl + } else { + ret or (shl shl 1) + } + } else { + ret or shl + } + } } return ret diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt index 5aabff2c8f..9029fbfd80 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt @@ -2,6 +2,7 @@ package com.zhjt.mogo_core_function_devatools.status.entity import com.zhjt.mogo_core_function_devatools.status.entity.RouteState.RouteFailed import com.zhjt.mogo_core_function_devatools.status.entity.RouteState.RouteNone +import com.zhjt.mogo_core_function_devatools.status.entity.RouteState.RouteStart import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.* @@ -461,7 +462,7 @@ enum class RouteState { data class RouteDownloadStatus(val lineId: Long = -1, val state: RouteState = RouteNone): Status(), IAutopilotPreLaunchStatus { override fun isException(): Boolean { - return state == RouteFailed + return state == RouteStart || state == RouteFailed } override fun equals(other: Any?): Boolean { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt index 0b88b19e68..64b1e24b93 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt @@ -25,8 +25,8 @@ internal class StatusModel : ViewModel() { it += BrakeStatus(0.0f) it += DoubleFlashStatus(0) it += GearStatus(0) - it += SpeedStatus(0f) it += RouteDownloadStatus() + it += SpeedStatus(0f) }) } 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 7a0be702b8..d1c91474d8 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 @@ -76,6 +76,7 @@ object CallerAutoPilotControlManager { * 刹车: 1<<2 * 双闪: 1<<3 * 档位: 1<<4 + * 轨迹下载: (下载中) 1<<5； （下载失败）1<<6 */ val exceptionValue = CallerDevaToolsManager.getExceptionStatusBeforeLaunchAutopilot() if (exceptionValue != 0) { @@ -95,6 +96,10 @@ object CallerAutoPilotControlManager { if ((exceptionValue and (1 shl 4)) != 0) { sb.append("档位$") } + if ((exceptionValue and (1 shl 5)) != 0 || ((exceptionValue and (1 shl 6)) != 0)) { + sb.setLength(0) + sb.append("轨迹未就绪，请稍后重试") + } val voiceText = sb.toString().let { str -> val count = str.count { it == '$' } if (count == 1) {