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

[6100][ada]移除配置不能启动自动驾驶档位参数

Browse Source
This commit is contained in:
xinfengkun
2025-01-16 15:01:24 +08:00
committed by yangyakun
parent c8ca3fd493
commit d5c342fc78
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
View File

@@ -57,8 +57,7 @@ object ConfigStartUp {
} }
// 各个module需要的url // 各个module需要的url
FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java) FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
//不能启动自动驾驶的档位
FunctionBuildConfig.launchAutopilotGear = BuildConfig.LAUNCH_AUTOPILOT_GEAR
// 各车型宣传视频本地配置json // 各车型宣传视频本地配置json
FunctionBuildConfig.mediaUrlConfig = BuildConfig.mediaUrlConfig FunctionBuildConfig.mediaUrlConfig = BuildConfig.mediaUrlConfig
FunctionBuildConfig.musicUrlConfig = BuildConfig.musicUrlConfig FunctionBuildConfig.musicUrlConfig = BuildConfig.musicUrlConfig

6
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -140,7 +140,7 @@ class MoGoAutopilotControlProvider :
.setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE)) .setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
.setRootCrt(CallerCloudCertManager.getRootCrtFDecode()) .setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode()) .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
.setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) // .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
// .setSubscribeInterfaceOptions(subscribeInterfaceOptions)// // .setSubscribeInterfaceOptions(subscribeInterfaceOptions)//
.build() .build()
@@ -237,7 +237,7 @@ class MoGoAutopilotControlProvider :
val options = AdasOptions val options = AdasOptions
.newBuilder() .newBuilder()
.setPassenger(true) .setPassenger(true)
.setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) // .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
.build() .build()
AdasManager.getInstance() AdasManager.getInstance()
.create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) .create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
@@ -272,7 +272,7 @@ class MoGoAutopilotControlProvider :
.setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE)) .setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
.setRootCrt(CallerCloudCertManager.getRootCrtFDecode()) .setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode()) .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
.setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) // .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
.build() .build()
AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
//////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听///////////////////////////////////////////// //////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听/////////////////////////////////////////////

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

@@ -330,13 +330,6 @@ object FunctionBuildConfig {
@JvmField @JvmField
var urlJson: UrlConfig = GsonUtils.fromJson("{\"och_url\":\"https://tech.zhidaozhixing.com\"}", UrlConfig::class.java) var urlJson: UrlConfig = GsonUtils.fromJson("{\"och_url\":\"https://tech.zhidaozhixing.com\"}", UrlConfig::class.java)
/**
* 最外层设置的Url
*/
@Volatile
@JvmField
var launchAutopilotGear: Set<Chassis.GearPosition>? = null
/** /**
* 当前应用是否支持patch升级 * 当前应用是否支持patch升级
*/ */