[2.15.0-merge-master]

This commit is contained in:
zhongchao
2023-05-06 20:03:51 +08:00
1466 changed files with 45283 additions and 27080 deletions

View File

@@ -47,6 +47,6 @@
| 东风、红旗 | fOchTaxi.gradle、fOchTaxiPassenger.gradle | P、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| 金旅小巴 | fOchBus.gradle、fOchBusPassenger.gradle、fOchShuttle.gradle、fOchShuttlePassenger.gradle | N、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| M1 | fOchBusPassengerM1.gradle | 不限制档位 | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' |
| M2 | fOchBusPassengerM2.gradle | N、P、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| 清扫车 | fOchSweeper.gradle | N | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);}}' |
| M2 | fOchShuttlePassengerM2.gradle | N、P、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| 清扫车 | fOchSweeper.gradle | 不限制档位 | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' |
| 开沃 | 暂无 | 不限制档位 | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' |

View File

@@ -86,6 +86,10 @@ android {
targetCompatibility 1.8
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = '1.8'
}
@@ -95,9 +99,10 @@ android {
manifest.srcFile 'src/main/AndroidManifest.xml'
}
}
flavorDimensions "business", "product", "basic", "env"
// 项目 business
// 业务线 product
// 车型 vehicle
flavorDimensions "project","product","vehicle" ,"basic", "env"
productFlavors {
// launcher app
launcher {
@@ -111,101 +116,82 @@ android {
buildConfigField 'String', 'MAP_SDK_VERSION', "\"${MAP_SDK_VERSION}\""
buildConfigField 'String', 'MAP_SDK_OPT_VERSION', "\"${MAP_SDK_OPERATION_VERSION}\""
}
mogo {
dimension "project"
buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\""
buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("mogo").replace("\"", "\\\"")}\""
}
yantai {
dimension "project"
buildConfigField 'String', 'URLs', "\"${readFileToJson("yantai").replace("\"", "\\\"")}\""
buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("yantai").replace("\"", "\\\"")}\""
}
dali {
dimension "project"
buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\""
buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("dali").replace("\"", "\\\"")}\""
}
// 空业务 主要是给鹰眼使用
noop {
dimension "business"
dimension "product"
}
busbase {
dimension "business"
// 小巴车业务
bus {
dimension "product"
}
taxibase {
dimension "business"
// 出租车业务
taxi {
dimension "product"
}
// 清扫车业务
sweeper {
dimension "business"
dimension "product"
}
shuttle {
dimension "business"
// 接驳车业务
shuttle{
dimension "product"
}
// 包车业务
charter{
dimension "product"
}
// 配置网络环境QA、线上、演示
qa {
dimension "env"
buildConfigField 'int', 'NET_ENV', '2'
buildConfigField 'String', 'URLs', "\"${readFileToJson("qa").replace("\"", "\\\"")}\""
}
online {
dimension "env"
buildConfigField 'int', 'NET_ENV', '3'
buildConfigField 'String', 'URLs', "\"${readFileToJson("online").replace("\"", "\\\"")}\""
}
demo {
dimension "env"
buildConfigField 'int', 'NET_ENV', '4'
buildConfigField 'String', 'URLs', "\"${readFileToJson("demo").replace("\"", "\\\"")}\""
}
}
// 配置不同渠道参数,直接影响功能完整度
apply from: "./productFlavors/fPadLenovo.gradle"
apply from: "./productFlavors/fPadLenovoOchBus.gradle"
apply from: "./productFlavors/fPadLenovoOchTaxi.gradle"
apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle"
apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle"
apply from: "./productFlavors/fPadLenovoOchSweeper.gradle"
apply from: "./productFlavors/fOchBus.gradle"
apply from: "./productFlavors/fOchShuttle.gradle"
apply from: "./productFlavors/fOchShuttleM2.gradle"
apply from: "./productFlavors/fOchTaxi.gradle"
apply from: "./productFlavors/fOchBusPassenger.gradle"
apply from: "./productFlavors/fOchShuttlePassengerM2.gradle"
apply from: "./productFlavors/fOchShuttlePassenger.gradle"
apply from: "./productFlavors/fOchTaxiPassenger.gradle"
apply from: "./productFlavors/fOchSweeper.gradle"
apply from: "./productFlavors/fMultiDisplayOchBus.gradle"
apply from: "./productFlavors/fMultiDisplayOchTaxi.gradle"
//包车
apply from: "./productFlavors/ochDriverM1.gradle"
apply from: "./productFlavors/ochPassengerM1.gradle"
apply from: "./productFlavors/fMultiDisplaySweeper.gradle"
variantFilter { variant ->
def names = variant.flavors*.name
//要检查特定的构建类型请使用variant.buildType.name ==“ <buildType>”
// region 过滤noop 的flavors 不带och业务的
if (names.contains("noop") && !names.contains("fPadLenovo")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤sweper 的flavors
if (names.contains("sweeper") && !names.contains("fPadLenovoOchSweeper")&& !names.contains("fMultiDisplaySweeper")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤shuttle 的flavors
if (names.contains("shuttle")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fPadLenovoOchBus")) {
} else if (names.contains("fPadLenovoOchBusPassenger")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤taxibase 的flavors
if (names.contains("taxibase")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fPadLenovoOchTaxi")) {
} else if (names.contains("fPadLenovoOchTaxiPassenger")) {
} else if (names.contains("fPadLenovo")) {
} else if (names.contains("fMultiDisplayOchTaxi")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤taxibase 的flavors
if (names.contains("busbase")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fPadLenovoOchBus")) {
} else if (names.contains("fPadLenovoOchBusPassenger")) {
} else if (names.contains("fMultiDisplayOchBus")) {
} else {
setIgnore(true)
}
}
// endregion
}
apply from: "./productFlavors/flavorsFilterConfig.gradle"
packagingOptions {
exclude 'META-INF/io.netty.versions.properties'
@@ -233,9 +219,7 @@ dependencies {
implementation rootProject.ext.dependencies.android_start_up
implementation rootProject.ext.dependencies.lancetx_runtime
implementation rootProject.ext.dependencies.mogocustommap
implementation project(':libraries:map-usbcamera')
implementation project(':tts:tts-pad')
implementation project(':core:function-impl:mogo-core-function-startup')
implementation project(':core:function-impl:mogo-core-function-devatools')
implementation project(':core:function-impl:mogo-core-function-datacenter')
@@ -320,41 +304,89 @@ static def getBuildTime() {
Object readFileToJson(env) {
try {
def businessType = project.hasProperty('business')
if (businessType) {
println("businessType${businessType}----${business}")
}
// 加载config.json 文件
File file = new File("${rootDir}/app/config.json")
File file = new File("${rootDir}/app/config/urlConfig.json")
def jsonSlurper = new JsonSlurper()
// 解析json
def config = jsonSlurper.parse(file)
def flavorNames = variantName()
def flavorNames = variantName()
def jsonOutput = new JsonOutput()
config.each { key, value ->
config.each {key, value ->
// 匹配flavor对应的 json
if (flavorNames.toLowerCase().contains(key)) {
if(flavorNames.toLowerCase().contains(key)){
return jsonOutput.toJson(value.get(env))
}
}
// 保底原则
return jsonOutput.toJson(config.get("busbase").get(env))
return jsonOutput.toJson(config.get(env).get(flavorNames))
} catch (IOException e) {
e.printStackTrace()
}
return null
}
def variantName() {
def taskName = getGradle().getStartParameter().getTaskRequests().toString()
def split = taskName.split(":")
if (split.length > 2) {
return split[2].toString().split("]")[0].replace("assemble", "")
} else {
if (taskName.contains("bus")) {
return "busbase"
} else {
return "taxibase"
if(gradle.startParameter.taskNames.size()>0) {
for (String taskName : gradle.startParameter.taskNames) {
if (taskName.contains("Yantai")) {
project.dependencies.add('implementation', project.project(':tts:tts-iflytek'))
}else if (taskName.contains("Mogo")) {
project.dependencies.add('implementation', project.project(':tts:tts-pad'))
}else if (taskName.contains("Dali")) {
project.dependencies.add('implementation', project.project(':tts:tts-pad'))
}else {
}
taskName = taskName.replace("Debug", "")
taskName = taskName.replace("Release", "")
if (taskName.endsWith("Qa")) {
return "qa"
} else if (taskName.endsWith("Online")) {
return "online"
} else if (taskName.endsWith("Demo")) {
return "demo"
}
}
}
return "qa"
}
Object readFileToJsonTemp(env){
try {
// 加载config.json 文件
File file = new File("${rootDir}/app/config/tempConfig.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
if(flavorNames.toLowerCase().contains(key)){
getKey = key
return true
}
}
return jsonOutput.toJson(config.get(env).get(getKey))
} catch (IOException e) {
e.printStackTrace()
}
return null
}
def variantVehicleName() {
if(gradle.startParameter.taskNames.size()>0) {
for (String taskName : gradle.startParameter.taskNames) {
if (taskName.contains("Debug") | taskName.contains("Release")) {
return taskName
}
}
}
return "buspassenger"
}

View File

@@ -1,46 +0,0 @@
{
"busbase": {
"qa": {
"och_url":"https://tech-qa.zhidaohulian.com"
},
"online": {
"och_url":"https://tech.zhidaohulian.com"
},
"demo": {
"och_url":"http://tech-dev.zhidaohulian.com"
}
},
"taxibase": {
"qa": {
"och_url":"https://tech-qa.zhidaohulian.com"
},
"online": {
"och_url":"https://tech.zhidaohulian.com"
},
"demo": {
"och_url":"http://tech-dev.zhidaohulian.com"
}
},
"shuttle": {
"qa": {
"och_url":"https://och-driver-qa.zhidaozhixing.com"
},
"online": {
"och_url":"https://och-driver.zhidaozhixing.com"
},
"demo": {
"och_url":"http://och-driver-dev.zhidaozhixing.com"
}
},
"sweeper": {
"qa": {
"och_url":"https://och-driver-qa.zhidaozhixing.com"
},
"online": {
"och_url":"https://och-driver.zhidaozhixing.com"
},
"demo": {
"och_url":"http://och-driver-dev.zhidaozhixing.com"
}
}
}

200
app/config/tempConfig.json Normal file
View File

@@ -0,0 +1,200 @@
{
"mogo": {
"shuttlepassenger": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
"type": 0,
"cacheImgPath": "",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
"type": 0,
"cacheImgPath": "",
"title": "2"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
"title": "3"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
"type": 0,
"cacheImgPath": "",
"title": "4"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
"type": 0,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
"title": "5"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
"title": "6"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
"type": 0,
"cacheImgPath": "",
"title": "7"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
"type": 0,
"cacheImgPath": "",
"title": "8"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
"type": 0,
"cacheImgPath": "",
"title": "9"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
"title": "10"
}
]
},
"shuttlepassengerm2": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
"type": 1,
"cacheImgPath": "",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
"type": 1,
"cacheImgPath": "",
"title": "2"
}
]
}
},
"dali": {
"shuttlepassenger": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
"type": 0,
"cacheImgPath": "",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
"type": 0,
"cacheImgPath": "",
"title": "2"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
"title": "3"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
"type": 0,
"cacheImgPath": "",
"title": "4"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
"type": 0,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
"title": "5"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
"title": "6"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
"type": 0,
"cacheImgPath": "",
"title": "7"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
"type": 0,
"cacheImgPath": "",
"title": "8"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
"type": 0,
"cacheImgPath": "",
"title": "9"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
"title": "10"
}
]
},
"shuttlepassengerm2": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
"type": 1,
"cacheImgPath": "",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
"type": 1,
"cacheImgPath": "",
"title": "2"
}
]
}
},
"yantai": {
"shuttlepassenger": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
"title": "2"
}
]
},
"shuttlepassengerm2": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
"type": 1,
"cacheImgPath": "",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
"type": 1,
"cacheImgPath": "",
"title": "2"
}
]
}
}
}

107
app/config/urlConfig.json Normal file
View File

@@ -0,0 +1,107 @@
{
"mogo": {
"qa": {
"och_url": "https://tech-qa.zhidaohulian.com",
"shuttle_url": "https://och-driver-qa.zhidaozhixing.com",
"passport_url": "",
"socket_base_url": "",
"socket_tech_url": "",
"eagle_mis_url": "",
"eagle_dns_url": "",
"bind_driver_qr_url": "",
"chart_socket_url":""
},
"online": {
"och_url": "https://tech.zhidaohulian.com",
"shuttle_url": "https://och-driver.zhidaozhixing.com",
"passport_url": "",
"socket_base_url": "",
"socket_tech_url": "",
"eagle_mis_url": "",
"eagle_dns_url": "",
"bind_driver_qr_url": "",
"chart_socket_url":""
},
"demo": {
"och_url": "http://tech-dev.zhidaohulian.com",
"shuttle_url": "https://och-driver-dev.zhidaozhixing.com",
"passport_url": "",
"socket_base_url": "",
"socket_tech_url": "",
"eagle_mis_url": "",
"eagle_dns_url": "",
"bind_driver_qr_url": "",
"chart_socket_url":""
}
},
"dali": {
"qa": {
"och_url": "https://och-a.zhidaozhixing.com",
"shuttle_url": "https://och-a.zhidaozhixing.com",
"passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws"
},
"online": {
"och_url": "https://och-driver-eh.zhidaozhixing.com",
"shuttle_url": "https://och-driver-eh.zhidaozhixing.com",
"passport_url": "https://och-driver-eh.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-driver-eh.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-driver-eh.zhidaozhixing.com/arch/",
"eagle_mis_url": "https://och-hailing-eh.zhidaozhixing.com/",
"eagle_dns_url": "https://och-hailing-eh.zhidaozhixing.com/",
"bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s",
"chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws"
},
"demo": {
"och_url": "https://och-a.zhidaozhixing.com",
"shuttle_url": "https://och-a.zhidaozhixing.com",
"passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://och-hailing-eh.zhidaozhixing.com/",
"eagle_dns_url": "http://och-hailing-eh.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ehsafety&sn=%1$s",
"chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws"
}
},
"yantai": {
"qa": {
"och_url": "https://och-a.zhidaozhixing.com",
"shuttle_url": "https://och-a.zhidaozhixing.com",
"passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"chart_socket_url":""
},
"online": {
"och_url": "https://och-driver-yt.zhidaozhixing.com",
"shuttle_url": "https://och-driver-yt.zhidaozhixing.com",
"passport_url": "https://och-driver-yt.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-driver-yt.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-driver-yt.zhidaozhixing.com/arch/",
"eagle_mis_url": "https://och-hailing-yt.zhidaozhixing.com/",
"eagle_dns_url": "https://och-hailing-yt.zhidaozhixing.com/",
"bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s",
"chart_socket_url":""
},
"demo": {
"och_url": "https://och-a.zhidaozhixing.com",
"shuttle_url": "https://och-a.zhidaozhixing.com",
"passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ytsafety&sn=%1$s",
"chart_socket_url":""
}
}
}

View File

@@ -3,23 +3,29 @@ project.dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop)
// sweeper清扫车
fPadLenovoOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper)
fOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper)
// Bus司机端
fPadLenovoOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
fOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
// Bus乘客端
fPadLenovoOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus)
fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus)
fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus)
fOchShuttlePassengerM2Implementation(rootProject.ext.dependencies.mogoochbus)
// taxi司机端
fPadLenovoOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
// taxi乘客端
fPadLenovoOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi)
fOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi)
// Bus司机端
fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
// Bus乘客端
fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
//接驳车司乘端
fOchShuttleImplementation(rootProject.ext.dependencies.mogoochbus)
fOchShuttlePassengerImplementation(rootProject.ext.dependencies.mogoochbus)
// taxi司机端
fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
// taxi乘客端
@@ -27,17 +33,22 @@ project.dependencies {
} else {
fPadLenovoImplementation (project(':OCH:mogo-och-noop'))
// sweeper 清扫车
fPadLenovoOchSweeperImplementation (project(':OCH:mogo-och-sweeper'))
fOchSweeperImplementation (project(':OCH:mogo-och-sweeper'))
// Bus司机端
fPadLenovoOchBusImplementation (project(':OCH:mogo-och-bus'))
fOchBusImplementation (project(':OCH:mogo-och-bus'))
// Bus乘客端
fPadLenovoOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger'))
fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger'))
// 包车
ochDriverM1Implementation (project(':OCH:mogo-och-charter'))
ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger'))
// taxi司机端
fPadLenovoOchTaxiImplementation (project(':OCH:mogo-och-taxi'))
fOchTaxiImplementation (project(':OCH:mogo-och-taxi'))
// taxi乘客端
fPadLenovoOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger'))
fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger'))
// 多屏幕-Bus司机端
fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus'))
@@ -45,6 +56,13 @@ project.dependencies {
fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger'))
// 多屏幕-taxi司机端
//接驳车司乘端
fOchShuttleImplementation (project(':OCH:mogo-och-shuttle'))
fOchShuttleM2Implementation (project(':OCH:mogo-och-shuttle'))
fOchShuttlePassengerImplementation (project(':OCH:mogo-och-shuttle-passenger'))
fOchShuttlePassengerM2Implementation (project(':OCH:mogo-och-shuttle-passenger'))
// taxi司机端
fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi'))
// 多屏幕-taxi乘客端
fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger'))

View File

@@ -13,11 +13,12 @@ APP_IDENTITY_MODE规则
Van 开沃
FT 福田
已有:
taxi司机屏 Taxi_Driver_Base (东风、红旗司机端)
taxi乘客屏 Taxi_Passenger_Base (东风、红旗乘客端)
bus司机屏 Bus_Driver_Base (金旅小巴司机端)
Bus_Driver_Van (开沃小巴司机端)
bus乘客屏 Bus_Passenger_Base (金旅、开沃小巴乘客端)
Bus_Passenger_M1 M1小巴乘客端)
Bus_Passenger_M2 M2小巴乘客端)
清扫Sweeper_Driver_FT (福田清扫车司机端
taxi司机屏 Taxi_Driver_DFHQ (东风、红旗司机端)
taxi乘客屏 Taxi_Passenger_DFHQ (东风、红旗乘客端)
bus司机屏 Bus_Driver_JLKV (金旅公交车司机端)
Bus_Driver_Van (开沃公交车司机端)
bus乘客屏 Bus_Passenger_JLKV (金旅、开沃公交车乘客端)
Bus_Passenger_M2 M2公交车乘客端)
清扫车 Sweeper_Driver_FT (福田清扫车司机端)
Charter_Driver_M1 (M1包车司机端)
Charter_Passenger_M1 (M1包车乘客端)

View File

@@ -13,7 +13,9 @@ project.android.productFlavors {
versionName rootProject.versionName
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的m1对应
matchingFallbacks = ['jinlvvan']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
@@ -31,13 +33,15 @@ project.android.productFlavors {
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Base\""
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JLKV\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'

View File

@@ -13,11 +13,10 @@ project.android.productFlavors {
versionName rootProject.versionName
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
// 高德地图鉴权信息
@@ -36,13 +35,16 @@ project.android.productFlavors {
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\""
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'

View File

@@ -13,7 +13,7 @@ project.android.productFlavors {
versionName rootProject.versionName
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

View File

@@ -1,10 +1,10 @@
project.android.productFlavors {
// -Pad--
fPadLenovoOchBus {
fOchBus {
externalNativeBuild {
ndk {
// SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -13,17 +13,17 @@ project.android.productFlavors {
versionName rootProject.versionName
//
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
matchingFallbacks = ['jinlvvan']
// 0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// AndroidManifest.xml中用到的参数
manifestPlaceholders = [
//
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fPadLenovoOchBus",
CHANNEL_VALUE : "fOchBus",
// Task给清空
ACTIVITY_ROOT : true,
// Activity的朝向
@@ -36,13 +36,15 @@ project.android.productFlavors {
buildConfigField 'int', 'GPS_PROVIDER', "1"
// README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Base\""
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JL\""
// IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
//
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
//
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
//
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
//
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

View File

@@ -0,0 +1,51 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车-乘客端
fOchBusPassenger {
externalNativeBuild {
ndk {
// 设置支持的SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应
matchingFallbacks = ['jinlvvan']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
//高德地图鉴权信息
manifestPlaceholders = [
AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,
CHANNEL_VALUE: "fOchBusPassenger",
ACTIVITY_ROOT:true,
SCREEN_ORIENTATION: "landscape"
]
// 是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-工控机2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JL\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
//Bus不能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
}
}

View File

@@ -0,0 +1,56 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车
fOchShuttle {
externalNativeBuild {
ndk {
// 设置支持的SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
versionCode rootProject.versionCode as int
versionName rootProject.versionName
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的shuttle对应
matchingFallbacks = ['shuttle']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
//高德地图鉴权信息
manifestPlaceholders = [
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
CHANNEL_VALUE : "fOchShuttle", ACTIVITY_ROOT: true,
SCREEN_ORIENTATION: "landscape"
]
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-工控机2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
//Bus不能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
}
}

View File

@@ -0,0 +1,56 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车
fOchShuttleM2 {
externalNativeBuild {
ndk {
// 设置支持的SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
versionCode rootProject.versionCode as int
versionName rootProject.versionName
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的shuttle对应
matchingFallbacks = ['shuttle']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
//高德地图鉴权信息
manifestPlaceholders = [
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
CHANNEL_VALUE : "fOchShuttleM2", ACTIVITY_ROOT: true,
SCREEN_ORIENTATION: "landscape"
]
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
// 是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-工控机2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_M2\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
//Bus不能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
}
}

View File

@@ -1,6 +1,6 @@
project.android.productFlavors {
// -Pad---
fPadLenovoOchBusPassenger {
fOchShuttlePassenger {
externalNativeBuild {
ndk {
// SO库架构
@@ -11,36 +11,39 @@ project.android.productFlavors {
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
//
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
matchingFallbacks = ['jinlvvan']
// 0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// AndroidManifest.xml中用到的参数
//
manifestPlaceholders = [
//
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fPadLenovoOchBusPassenger",
// Task给清空
CHANNEL_VALUE : "fOchShuttlePassenger",
ACTIVITY_ROOT : true,
// Activity的朝向
SCREEN_ORIENTATION: "landscape"
]
//
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
//
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Base\""
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\""
// IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
//
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
//
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
//
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
//
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

View File

@@ -0,0 +1,52 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车-乘客端
fOchShuttlePassengerM2 {
externalNativeBuild {
ndk {
// 设置支持的SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的m2对应
matchingFallbacks = ['m2']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
//高德地图鉴权信息
manifestPlaceholders = [
AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,
CHANNEL_VALUE: "fOchBusPassenger",
ACTIVITY_ROOT:true,
SCREEN_ORIENTATION: "portrait"
]
// 是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-工控机2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_M2\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
//M2不能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}'
}
}

View File

@@ -1,10 +1,10 @@
project.android.productFlavors {
// -Pad--
fPadLenovoOchSweeper {
fOchSweeper {
externalNativeBuild {
ndk {
// SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -13,7 +13,7 @@ project.android.productFlavors {
versionName rootProject.versionName
//
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
@@ -23,7 +23,7 @@ project.android.productFlavors {
//
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fPadLenovoOchSweeper",
CHANNEL_VALUE : "fOchSweeper",
// Task给清空
ACTIVITY_ROOT : true,
// Activity的朝向
@@ -43,6 +43,9 @@ project.android.productFlavors {
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
//
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
//
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
//
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

View File

@@ -1,11 +1,11 @@
project.android.productFlavors {
// -Pad--
fPadLenovoOchTaxi {
fOchTaxi {
externalNativeBuild {
ndk {
// SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -14,7 +14,7 @@ project.android.productFlavors {
versionName rootProject.versionName
//
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
@@ -24,7 +24,7 @@ project.android.productFlavors {
//
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fPadLenovoOchTaxi",
CHANNEL_VALUE : "fOchTaxi",
// Task给清空
ACTIVITY_ROOT : true,
// Activity的朝向
@@ -37,13 +37,15 @@ project.android.productFlavors {
buildConfigField 'int', 'GPS_PROVIDER', "1"
// README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\""
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\""
// IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
//
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
//
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
//
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
//
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

View File

@@ -1,10 +1,10 @@
project.android.productFlavors {
// -Pad---
fPadLenovoOchTaxiPassenger {
fOchTaxiPassenger {
externalNativeBuild {
ndk {
// SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -13,7 +13,7 @@ project.android.productFlavors {
versionName rootProject.versionName
//
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
@@ -23,7 +23,7 @@ project.android.productFlavors {
//
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fPadLenovoOchTaxiPassenger",
CHANNEL_VALUE : "fOchTaxiPassenger",
// Task给清空
ACTIVITY_ROOT : false,
// Activity的朝向
@@ -36,13 +36,15 @@ project.android.productFlavors {
buildConfigField 'int', 'GPS_PROVIDER', "1"
// README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_Base\""
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\""
// IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\""
//
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
//
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
//
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
//
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

View File

@@ -11,7 +11,7 @@ project.android.productFlavors {
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "product"
dimension "vehicle"
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
@@ -40,6 +40,8 @@ project.android.productFlavors {
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'

View File

@@ -0,0 +1,169 @@
project.android.variantFilter { variant ->
def names = variant.flavors*.name
//要检查特定的构建类型请使用variant.buildType.name ==“ <buildType>”
if(names.contains("mogo")) {
// region 过滤noop 的flavors 不带och业务的
if (names.contains("noop")&&!names.contains("fPadLenovo")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤sweper 的flavors
if (names.contains("sweeper") && !names.contains("fOchSweeper")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤shuttle 的flavors
if (names.contains("shuttle")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchShuttle")) {
} else if (names.contains("fOchShuttleM2")) {
} else if (names.contains("fOchShuttlePassenger")) {
} else if (names.contains("fOchShuttlePassengerM2")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤taxi 的flavors
if (names.contains("taxi")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchTaxi")) {
} else if (names.contains("fOchTaxiPassenger")) {
} else if (names.contains("fPadLenovo")) {
} else if (names.contains("fMultiDisplayOchTaxi")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤bus 的flavors
if (names.contains("bus")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchBus")) {
} else if (names.contains("fOchBusPassenger")) {
} else if (names.contains("fMultiDisplayOchBus")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤charter 包车 的flavors
if (names.contains("charter")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("ochDriverM1")) {
} else if (names.contains("ochPassengerM1")) {
} else if (names.contains("fMultiDisplaySweeper")) {
} else {
setIgnore(true)
}
}
// endregion
}
else if(names.contains("dali")){
// region 过滤noop 的flavors 不带och业务的
if (names.contains("noop")&&!names.contains("fPadLenovo")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤sweper 的flavors
if (names.contains("sweeper")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤taxi 的flavors
if (names.contains("taxi")) {
setIgnore(true)
}
// endregion
// region 过滤shuttle 的flavors
if (names.contains("shuttle")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchShuttle")) {
} else if (names.contains("fOchShuttleM2")) {
} else if (names.contains("fOchShuttlePassenger")) {
} else if (names.contains("fOchShuttlePassengerM2")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤bus 的flavors
if (names.contains("bus")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchBus")) {
} else if (names.contains("fOchBusPassenger")) {
} else if (names.contains("fMultiDisplayOchBus")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤charter 包车 的flavors
if (names.contains("charter")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("ochDriverM1")) {
} else if (names.contains("ochPassengerM1")) {
} else {
setIgnore(true)
}
}
// endregion
}
else if(names.contains("yantai")){//
// region 过滤noop 的flavors 不带och业务的
if (names.contains("noop")&&!names.contains("fPadLenovo")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤sweper 的flavors
if (names.contains("sweeper") && !names.contains("fOchSweeper")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤shuttle 的flavors
if (names.contains("shuttle")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchShuttle")) {
} else if (names.contains("fOchShuttlePassenger")) {
} else {
setIgnore(true)
}
}
// endregion
// region 过滤taxi 的flavors
if (names.contains("taxi")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤bus 的flavors
if (names.contains("bus")) {
//Gradle会忽略满足上述条件的所有变体
setIgnore(true)
}
// endregion
// region 过滤charter 包车 的flavors
if (names.contains("charter")) {
//Gradle会忽略满足上述条件的所有变体
if (names.contains("ochDriverM1")) {
} else if (names.contains("ochPassengerM1")) {
} else {
setIgnore(true)
}
}
// endregion
}
else {
setIgnore(true)
}
}

View File

@@ -0,0 +1,55 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车
ochDriverM1 {
externalNativeBuild {
ndk {
// 设置支持的SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
versionCode rootProject.versionCode as int
versionName rootProject.versionName
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "vehicle"
matchingFallbacks = ['driverm1']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
// 高德地图鉴权信息
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fOchBus",
// 在启动的时候把Task给清空
ACTIVITY_ROOT : true,
// Activity的朝向
SCREEN_ORIENTATION: "landscape"
]
// 是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-工控机2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Driver_M1\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
//M1不能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
}
}

View File

@@ -0,0 +1,55 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车-乘客端
ochPassengerM1 {
externalNativeBuild {
ndk {
// 设置支持的SO库架构
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
applicationId rootProject.ext.android.fLauncherApplicationId
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的m1对应
matchingFallbacks = ['m1']
// 车机类型主要用于区分自研车机还是别人家的车机自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
// 高德地图鉴权信息
AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue,
// BUGLY_APP_CHANNEL
CHANNEL_VALUE : "fOchBusPassenger",
// 在启动的时候把Task给清空
ACTIVITY_ROOT : true,
// Activity的朝向
SCREEN_ORIENTATION: "landscape"
]
// 是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// GPS数据提供源 0-Android系统1-工控机2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型,具体查看 README.md APP_IDENTITY_MODE规则
buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Passenger_M1\""
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示(美化)模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
// 构建的是否要动态更换模型
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
// 是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
// 构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
//M1不能启动自驾的档位
buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
}
}

View File

@@ -3,11 +3,15 @@ afterEvaluate {
def launcher = [
"fPadLenovo",
"fPadLenovoOchSweeper",
"fPadLenovoOchTaxi",
"fPadLenovoOchBus",
"fPadLenovoOchBusPassenger",
"fPadLenovoOchTaxiPassenger",
"fOchSweeper",
"fOchTaxi",
"fOchBus",
"fOchBusPassenger",
"fOchBusPassengerM1",
"fOchShuttlePassengerM2",
"fOchShuttle",
"fOchShuttlePassenger",
"fOchTaxiPassenger",
"MultiDisplayOchBus",
"MultiDisplayOchTaxi"]

View File

@@ -19,13 +19,6 @@
android:usesCleartextTraffic="true"
tools:replace="android:label">
<meta-data
android:name="design_width_in_dp"
android:value="2560"/>
<meta-data
android:name="design_height_in_dp"
android:value="1600"/>
<!-- 配置APP ID -->
<meta-data
android:name="BUGLY_APPID"

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
//是否支持Patch升级
FunctionBuildConfig.isSupportPatchUpgrade = BuildConfig.IS_SUPPORT_PATCH_UPGRADE
@@ -83,6 +85,7 @@ object ConfigStartUp {
DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION)
DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
DebugConfig.setCarModelChange(BuildConfig.IS_CAR_MODEL_CHANGE)
DebugConfig.setReplaceStatusview(BuildConfig.IS_REPLACE_STATUSVIEW)
}
private fun initOtherConfig(context: Context) {
@@ -96,9 +99,21 @@ object ConfigStartUp {
} else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
}
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)) {
if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) ||
AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)
|| AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) ||
AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
//白天模式
@@ -106,6 +121,11 @@ object ConfigStartUp {
} else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
} else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)) {
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
//白天模式
FunctionBuildConfig.skinMode = 1
}
}
@@ -113,6 +133,7 @@ object ConfigStartUp {
mapParams.setDebugMode(false) // 1-使用本地地图数据0-使用在线地图数据
//.setDataFileSource(1)
.setDebugMode(false)
.setIsRecordLogs(false)
.setCoordinateType(MapParams.COORDINATETYPE_GCJ02)
.setPerspectiveMode(MapParams.MAP_PERSPECTIVE_UP_CAR)
.setHDVisibileArray(
@@ -148,6 +169,12 @@ object ConfigStartUp {
if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
mapParams.setShadowEnable(false)
}
if(AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
// shuttle m2 车需要偏移
if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
mapParams.setCarPosition(-0.5f)
}
}
MapAutoApi.init(context, mapParams)