From 91f5cc2efb16cf388e5d8634d15a7e6aaaaa6298 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Thu, 16 Jan 2025 15:01:24 +0800
Subject: [PATCH] =?UTF-8?q?[6100][ada]=E7=A7=BB=E9=99=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E6=A1=A3=E4=BD=8D=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/launcher/startup/ConfigStartUp.kt   | 3 +--
 .../datacenter/autopilot/MoGoAutopilotControlProvider.kt   | 6 +++---
 .../com/mogo/eagle/core/data/config/FunctionBuildConfig.kt | 7 -------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
index 8874aab760..f11c5734b8 100644
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -57,8 +57,7 @@ object ConfigStartUp {
         }
         // 各个module需要的url
         FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
-        //不能启动自动驾驶的档位
-        FunctionBuildConfig.launchAutopilotGear = BuildConfig.LAUNCH_AUTOPILOT_GEAR
+
         // 各车型宣传视频本地配置json
         FunctionBuildConfig.mediaUrlConfig = BuildConfig.mediaUrlConfig
         FunctionBuildConfig.musicUrlConfig = BuildConfig.musicUrlConfig
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 1013e929a5..8c577e312e 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
@@ -140,7 +140,7 @@ class MoGoAutopilotControlProvider :
                     .setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
                     .setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
                     .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
-                    .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
+//                    .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
 //                    .setSubscribeInterfaceOptions(subscribeInterfaceOptions)//
                     .build()
 
@@ -237,7 +237,7 @@ class MoGoAutopilotControlProvider :
                                     val options = AdasOptions
                                         .newBuilder()
                                         .setPassenger(true)
-                                        .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
+//                                        .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
                                         .build()
                                     AdasManager.getInstance()
                                         .create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
@@ -272,7 +272,7 @@ class MoGoAutopilotControlProvider :
             .setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
             .setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
             .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
-            .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
+//            .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
             .build()
         AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
         //////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听/////////////////////////////////////////////
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 6d7f326b30..9e1318335a 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
@@ -330,13 +330,6 @@ object FunctionBuildConfig {
     @JvmField
     var urlJson: UrlConfig = GsonUtils.fromJson("{\"och_url\":\"https://tech.zhidaozhixing.com\"}", UrlConfig::class.java)
 
-    /**
-     * 最外层设置的Url
-     */
-    @Volatile
-    @JvmField
-    var launchAutopilotGear: Set<Chassis.GearPosition>? = null
-
     /**
      * 当前应用是否支持patch升级
      */