From 9480fd65a3dcaaf798b2dae3c7c396d66016cc5d Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 19 Sep 2023 14:47:44 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0][=E5=BC=95=E5=AF=BC=E7=BA=BF]=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E6=A0=87=E8=AF=86=E4=BD=8D=E6=9D=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF[?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=BB=98=E5=88=B6=E5=BC=95=E5=AF=BC=E7=BA=BF?= =?UTF-8?q?]=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 2 +- .../business/routeoverlay/MogoRouteOverlayManager.java | 2 +- .../com/mogo/eagle/core/data/config/FunctionBuildConfig.kt | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 9afcb519c2..ca1967a41d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -756,7 +756,7 @@ internal class DebugSettingView @JvmOverloads constructor( // 强制绘制引导线 tbIsDrawAutopilotTrajectoryData.setOnCheckedChangeListener { _, isChecked -> - FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = isChecked + FunctionBuildConfig.isForceDrawAutopilotTrajectoryByDebugSettingView = isChecked } // 初始化 GSP数据源 数据 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java index 838a597dc8..32ff8ae1a0 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java @@ -76,7 +76,7 @@ public class MogoRouteOverlayManager implements RouteOverlayDrawer.getInstance().clearMogoRouteOverlay(); return; } - boolean force = FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData; + boolean force = FunctionBuildConfig.isForceDrawAutopilotTrajectoryByDebugSettingView || FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData; if (!force && autopilotMode.get() != 2) { RouteOverlayDrawer.getInstance().clearMogoRouteOverlay(); return; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 517e4ca1e2..1b9d01dbb7 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -189,6 +189,13 @@ object FunctionBuildConfig { @JvmField var isIgnoreConditionsDrawAutopilotTrajectoryData = false + /** + * 调试面板中，是否开启了强制绘制引导线 + */ + @Volatile + @JvmField + var isForceDrawAutopilotTrajectoryByDebugSettingView = false + /** * 皮肤模式 * 0--默认夜间模式，