yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d_230912_6.1.0' into dev_robotaxi-d_230912_6.1.0

Browse Source
This commit is contained in:
wangmingjun
2023-09-19 15:00:34 +08:00
parent 395a9b4ead 9480fd65a3
commit f05e8177b9
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -756,7 +756,7 @@ internal class DebugSettingView @JvmOverloads constructor(
// 强制绘制引导线
tbIsDrawAutopilotTrajectoryData.setOnCheckedChangeListener { _, isChecked ->
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = isChecked
FunctionBuildConfig.isForceDrawAutopilotTrajectoryByDebugSettingView = isChecked
}
// 初始化 GSP数据源 数据

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
View File

@@ -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;

7
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
View File

@@ -189,6 +189,13 @@ object FunctionBuildConfig {
@JvmField
var isIgnoreConditionsDrawAutopilotTrajectoryData = false
/**
* 调试面板中，是否开启了强制绘制引导线
*/
@Volatile
@JvmField
var isForceDrawAutopilotTrajectoryByDebugSettingView = false
/**
* 皮肤模式
* 0--默认夜间模式，