From 0a2fa1224434545673977c7ad0b320e56ebdc94c Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 14 Jun 2023 19:40:55 +0800 Subject: [PATCH] =?UTF-8?q?[Sweeper-Cloud]=20refactor:=20=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=20AdasOptions=20->=20Constants=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/MoGoAutopilotControlProvider.kt | 4 ++-- .../zhidao/support/adas/high/AdasOptions.java | 22 ------------------- .../support/adas/high/common/Constants.java | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index af9db50ee0..1c3b6cfcd4 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -319,11 +319,11 @@ class MoGoAutopilotControlProvider : } override fun startAutoPilot(controlParameters: AutopilotControlParameters) { - startAutoPilot(controlParameters, AdasOptions.AUTOPILOT_SOURCE.PAD) + startAutoPilot(controlParameters, Constants.AUTOPILOT_SOURCE.PAD) } override fun startAutoPilotByMoFang(controlParameters: AutopilotControlParameters) { - startAutoPilot(controlParameters, AdasOptions.AUTOPILOT_SOURCE.MO_FANG) + startAutoPilot(controlParameters, Constants.AUTOPILOT_SOURCE.MO_FANG) } private fun startAutoPilot(controlParameters: AutopilotControlParameters, source: Int) { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasOptions.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasOptions.java index d3aef40686..dcdc047c72 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasOptions.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasOptions.java @@ -29,28 +29,6 @@ public class AdasOptions { int ASSIGN = 1; } - /** - * 启动自动驾驶-Source类型 - */ - public interface AUTOPILOT_SOURCE { - /** - * pad模拟 - */ - int PAD_SIMULATE = 0; - /** - * pad业务 - */ - int PAD = 1; - /** - * AICloud - */ - int AI_CLOUD = 2; - /** - * 魔方 - */ - int MO_FANG = 3; - } - /** * 是否是客户端 true:客户度(乘客屏) false:服务端(司机屏) * 当是乘客端的情况下 ipcConnectionMode ipcAssignIP ipcFixationIPSet 均无效 diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/Constants.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/Constants.java index 08670c2d31..0d914fa7f0 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/Constants.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/Constants.java @@ -134,4 +134,26 @@ public class Constants { int RAMP_THETA_VALID = 7;//环岛模式开关 int WEAK_NET_SLOW_DOWN = 8;//弱网减速停车策略开关 } + + /** + * 启动自动驾驶-Source类型 + */ + public interface AUTOPILOT_SOURCE { + /** + * pad模拟 + */ + int PAD_SIMULATE = 0; + /** + * pad业务 + */ + int PAD = 1; + /** + * AICloud + */ + int AI_CLOUD = 2; + /** + * 魔方 + */ + int MO_FANG = 3; + } }