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

[6.10.0]

Browse Source 
[fea]
[删除车型维度]
This commit is contained in:
yangyakun
2025-01-23 14:55:57 +08:00
parent 496af11530
commit bf313f04c1
98 changed files with 1540 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@@ -140,7 +140,7 @@ android {
// 项目 business
// 业务线 product
// 车型 vehicle
flavorDimensions "project","vehicle" ,"role", "env"
flavorDimensions "project","role", "env"
productFlavors {
}
@@ -150,15 +150,7 @@ android {
apply from: "./script/roleFlavors/passenger.gradle"
apply from: "./script/roleFlavors/driverpassenger.gradle"
// 配置不同渠道参数，直接影响功能完整度
apply from: "./script/vehicleFlavors/B1.gradle"
apply from: "./script/vehicleFlavors/B2.gradle"
apply from: "./script/vehicleFlavors/T1T2.gradle"
apply from: "./script/vehicleFlavors/ALL.gradle"
apply from: "./script/vehicleFlavors/C1.gradle"
//包车
apply from: "./script/vehicleFlavors/M1.gradle"
apply from: "./script/flavorfilter/flavorsFilterConfig.gradle"
// apply from: "./script/flavorfilter/flavorsFilterConfig.gradle"
packagingOptions {
exclude 'META-INF/io.netty.versions.properties'

25
app/config/productWithVehicle.json
View File

@@ -1,25 +0,0 @@
{
"mogo": {
"B1":["shuttle","bus"],
"B2":["shuttle","bus"],
"T1T2":["taxi"],
"ALL":["charter","shuttle","bus","taxi"]
},
"dali": {
"B1":["shuttle"],
"B2":["shuttle"],
"M1":["charter"]
},
"yantai": {
"B1":["shuttle"],
"B2":["shuttle"],
"M1":["charter"]
},
"saas": {
"T1T2":["taxi"],
"B1":["shuttle","bus","scheduled"],
"B2":["shuttle","bus","scheduled"],
"M1":["charter","shuttle"],
"ALL":["charter","shuttle","bus","taxi","scheduled"]
}
}

4
app/script/projectFlavors/project.gradle
View File

@@ -9,7 +9,6 @@ project.android.productFlavors {
buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'musicUrlConfig', "\"${readMusicUrlConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'supportBusiness', "\"${readProductWithVehicleConfigFromJsonFile("mogo").replace("\"", "\\\"")}\""
}
yantai {
dimension "project"
@@ -18,7 +17,6 @@ project.android.productFlavors {
buildConfigField 'String', 'URLs', "\"${readFileToJson("yantai").replace("\"", "\\\"")}\""
buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("yantai").replace("\"", "\\\"")}\""
buildConfigField 'String', 'musicUrlConfig', "\"${readMusicUrlConfigFromJsonFile("yantai").replace("\"", "\\\"")}\""
buildConfigField 'String', 'supportBusiness', "\"${readProductWithVehicleConfigFromJsonFile("yantai").replace("\"", "\\\"")}\""
}
dali {
@@ -28,7 +26,6 @@ project.android.productFlavors {
buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\""
buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("dali").replace("\"", "\\\"")}\""
buildConfigField 'String', 'musicUrlConfig', "\"${readMusicUrlConfigFromJsonFile("dali").replace("\"", "\\\"")}\""
buildConfigField 'String', 'supportBusiness', "\"${readProductWithVehicleConfigFromJsonFile("dali").replace("\"", "\\\"")}\""
}
saas {
dimension "project"
@@ -37,7 +34,6 @@ project.android.productFlavors {
buildConfigField 'String', 'URLs', "\"${readFileToJson("saas").replace("\"", "\\\"")}\""
buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("saas").replace("\"", "\\\"")}\""
buildConfigField 'String', 'musicUrlConfig', "\"${readMusicUrlConfigFromJsonFile("saas").replace("\"", "\\\"")}\""
buildConfigField 'String', 'supportBusiness', "\"${readProductWithVehicleConfigFromJsonFile("saas").replace("\"", "\\\"")}\""
}
// 配置网络环境，QA、线上、演示

4
app/script/roleFlavors/driver.gradle
View File

@@ -8,10 +8,6 @@ project.android.productFlavors {
}
}
manifestPlaceholders = [
CHANNEL_VALUE_BODY : "Driver",
]
// ①标识
buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\""

4
app/script/roleFlavors/driverpassenger.gradle
View File

@@ -9,10 +9,6 @@ project.android.productFlavors {
}
}
manifestPlaceholders = [
CHANNEL_VALUE_BODY : "Passenger",
]
// ①标识
buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\""

4
app/script/roleFlavors/passenger.gradle
View File

@@ -8,10 +8,6 @@ project.android.productFlavors {
}
}
manifestPlaceholders = [
CHANNEL_VALUE_BODY : "Passenger",
]
// ①标识
buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\""

33
app/script/utils.gradle
View File

@@ -30,38 +30,6 @@ Object readMediaUrlConfigFromJsonFile(env){
return null
}
/**
* 读取各车型宣传视频本地配置
* @param env
* @return
*/
Object readProductWithVehicleConfigFromJsonFile(env){
try {
// 加载config.json 文件
File file = new File("${rootDir}/app/config/productWithVehicle.json")
def jsonSlurper = new JsonSlurper()
// 解析json
def config = jsonSlurper.parse(file)
def flavorNames = variantVehicleName()
def jsonOutput = new JsonOutput()
def getKey = flavorNames
config.get(env).each {key, value ->
// 匹配flavor对应的 json
println "${env}____ 对比${flavorNames.toLowerCase()}---------${key}---${value}"
if(flavorNames.toLowerCase().contains("${env}${key.toLowerCase()}")){
getKey = key
println "对比结果${flavorNames.toLowerCase()}---------${key}"
return true
}
}
return jsonOutput.toJson(config.get(env).get(getKey))
} catch (IOException e) {
e.printStackTrace()
}
return null
}
/**
@@ -139,5 +107,4 @@ ext {
isBaiLing = this.&isBaiLing
readMediaUrlConfigFromJsonFile = this.&readMediaUrlConfigFromJsonFile
readMusicUrlConfigFromJsonFile = this.&readMusicUrlConfigFromJsonFile
readProductWithVehicleConfigFromJsonFile = this.&readProductWithVehicleConfigFromJsonFile
}

18
app/script/vehicleFlavors/ALL.gradle
View File

@@ -4,24 +4,6 @@ project.android.productFlavors {
dimension "vehicle"
missingDimensionStrategy "vehicle","dfhq","jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
CHANNEL_VALUE_TAIL: "ALL",
]
// ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"ALL\""
// ②构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// ③能启动自驾的档位 MAP<360代码中会移除P档
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_D);add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);}}'
// ④是否支持多屏显示
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
}
}

16
app/script/vehicleFlavors/B1.gradle
View File

@@ -5,21 +5,5 @@ project.android.productFlavors {
matchingFallbacks = ['jinlvvan']
missingDimensionStrategy "vehicle", "jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
CHANNEL_VALUE_TAIL : "B1",
]
// ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"B1\""
// ②构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// ③能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_D);}}'
// ④是否支持多屏显示
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
}
}

15
app/script/vehicleFlavors/B2.gradle
View File

@@ -12,21 +12,6 @@ project.android.productFlavors {
matchingFallbacks = ['jinlvvan']
missingDimensionStrategy "vehicle", "m21", "jinlvvan"
}
//高德地图鉴权信息
manifestPlaceholders = [
CHANNEL_VALUE_TAIL: "B2",
]
// ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"B2\""
// ②构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// ③M2能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_D);}}'
// ④是否支持多屏显示
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
}
}

15
app/script/vehicleFlavors/C1.gradle
View File

@@ -5,26 +5,11 @@ project.android.productFlavors {
missingDimensionStrategy "vehicle","ft","jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
CHANNEL_VALUE_TAIL: "C1",
]
// ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"C1\""
// ②构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// ③能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'null'
// ⑤清扫车 默认模式（运营/云控）
buildConfigField 'String', 'SWEEPER_DEFAULT_MODE', '\"Cloud\"'
// ⑥清扫车 是否能切换模式
buildConfigField 'boolean', 'SWEEPER_CAN_SWITCH_MODE', 'true'
// ④是否支持多屏显示
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
}
}

16
app/script/vehicleFlavors/M1.gradle
View File

@@ -3,21 +3,5 @@ project.android.productFlavors {
M1 {
dimension "vehicle"
missingDimensionStrategy "vehicle", "jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
CHANNEL_VALUE_TAIL: "M1",
]
// ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M1\""
// ②M1能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_D);}}'
// ③不能启动自驾的档位
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// ④是否支持多屏显示
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
}
}

15
app/script/vehicleFlavors/T1T2.gradle
View File

@@ -4,24 +4,9 @@ project.android.productFlavors {
dimension "vehicle"
missingDimensionStrategy "vehicle","dfhq","jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
CHANNEL_VALUE_TAIL: "T1T2",
]
// ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"T1T2\""
// ②构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// ③能启动自驾的档位 MAP<360代码中会移除P档
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_D);add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);}}'
// ④是否支持多屏显示
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
}
}

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

@@ -51,10 +51,6 @@ object ConfigStartUp {
// 演示模式,上一次勾选的数据
FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE
FunctionBuildConfig.ttsLanguage = BuildConfig.ttsLanguage
// 支持的业务类型
if(!StringUtils.isEmpty(BuildConfig.supportBusiness)&&BuildConfig.supportBusiness!="null"){
FunctionBuildConfig.supportBusiness = GsonUtils.fromJson(BuildConfig.supportBusiness, object : TypeToken<MutableList<String>>() {}.type)
}
// 各个module需要的url
FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
@@ -68,15 +64,7 @@ object ConfigStartUp {
// app安装的身份信息
// 这里影响当前Activity的身份信息，多进程，主进程为司机端，:passenger 进程为乘客端
// TODO emArrow isMultiDisplay暂时不启用，仅测试3588，在B2 2024车预研
if (DebugConfig.isMultiDisplay()) {
if(ProcessUtils.getCurrentProcessName().contains("passenger")){
FunctionBuildConfig.appIdentityMode = "Product_Passenger_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
}else{
FunctionBuildConfig.appIdentityMode = "Product_Driver_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
}
}else{
FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
}
FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_Vehicle"
// 不同身份对应不同的IP地址
FunctionBuildConfig.adasConnectIP = BuildConfig.ADAS_CONNECT_IP
// 是否开启secure校验
@@ -102,11 +90,10 @@ object ConfigStartUp {
DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE)
// todo DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product)
DebugConfig.setProjectFlavor(BuildConfig.FLAVOR_project)
DebugConfig.setEnvFlavor(BuildConfig.FLAVOR_env)
DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID)
DebugConfig.setMapVersion(BuildConfig.MAP_SDK_VERSION)
DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION)
DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
DebugConfig.setCarModelChange(BuildConfig.IS_CAR_MODEL_CHANGE)
}
private fun initOtherConfig(context: Context) {