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

Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_gradle_och_230317

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/productFlavors/fOchShuttlePassengerM2.gradle
#	app/productFlavors/flavorsFilterConfig.gradle
#	app/script/functions/och.gradle
#	app/script/vehicleFlavors/fOchShuttleM2.gradle
This commit is contained in:
yangyakun
2023-04-11 20:39:01 +08:00
parent 750be7b99d 9a6d559d09
commit 3869871bdc
316 changed files with 4064 additions and 23009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,8 @@ object ConfigStartUp {
FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
//不能启动自动驾驶的档位
FunctionBuildConfig.unableLaunchAutopilotGear = BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR
// 临时配置json
FunctionBuildConfig.tempConfig = BuildConfig.tempConfig
// // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端 TODO 暂时不启用，仅做洱海交付，独立乘客屏+宣传视频
// if (ProcessUtils.getCurrentProcessName().contains(":passenger")) {
@@ -90,20 +92,20 @@ object ConfigStartUp {
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
}else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)){
HdMapBuildConfig.currentCarVrIconRes = R.raw.m2
} else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
} else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
} else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
} else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
} else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)){
}
if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
}
if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){
HdMapBuildConfig.currentCarVrIconRes = R.raw.m1
}
if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.m2
}
if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) ||