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

Merge branch 'dev_robosweeper-d_231016_6.1.0_combine_business_model' into dev_robosweeper-d_231016_6.1.0_combine_business_model_new

Browse Source
This commit is contained in:
aibingbing
2023-10-18 19:45:59 +08:00
parent 5043aa8c8f a215ccc112
commit b2706a67eb
432 changed files with 555 additions and 6445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/script/flavorfilter/flavors.json
View File

@@ -6,9 +6,6 @@
"sweeperOperate" :{
"driver": ["ochFT"]
},
"sweeperCloud" :{
"driver": ["ochFT"]
},
"shuttle" :{
"driver": ["ochJL","ochM2"],
"passenger": ["ochJL","ochM2"]

17
app/script/functions/och.gradle
View File

@@ -3,7 +3,6 @@ apply from: "./script/utils.gradle"
project.dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop)
// Bus司机端
// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
// // Bus乘客端
@@ -13,9 +12,7 @@ project.dependencies {
// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
// // taxi乘客端
// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
} else {
if (isCurrentDriver("noop")) {
noopImplementation(project(':OCH:mogo-och-noop'))
} else if (isCurrentDriver("bus")) {
@@ -30,17 +27,15 @@ project.dependencies {
implementation project(':OCH:shuttle:driver')
} else if (isCurrentPassenger("shuttle")) {
implementation project.project(':OCH:shuttle:passenger')
} else if (isCurrentDriver("sweeperCloud")) {
implementation project.project(':OCH:sweeper:sweeper-cloud')
} else if (isCurrentDriver("sweeperOperate")) {
implementation project.project(':OCH:sweeper:sweeper')
implementation project.project(':OCH:sweeper:driver')
} else if (isCurrentDriver("taxiunmanned")) {
implementation project.project(':OCH:taxi:unmanned-driver')
} else if (isCurrentPassenger("taxiunmanned")) {
implementation project.project(':OCH:taxi:unmanned-passenger')
} else if (isCurrentDriver("taxi")) {
implementation project.project(':OCH:taxi:driver')
}else if (isCurrentPassenger("taxi")) {
} else if (isCurrentPassenger("taxi")) {
implementation project.project(':OCH:taxi:passenger')
} else {
noopImplementation(project(':OCH:mogo-och-noop'))
@@ -50,18 +45,13 @@ project.dependencies {
implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:shuttle:driver')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:sweeper:sweeper-cloud')
implementation project.project(':OCH:sweeper:sweeper')
implementation project.project(':OCH:sweeper:driver')
implementation project.project(':OCH:taxi:driver')
implementation project.project(':OCH:taxi:passenger')
implementation project.project(':OCH:taxi:unmanned-driver')
implementation project.project(':OCH:taxi:unmanned-passenger')
}
if(isCurrentFlavors("sweeperCloud")){
project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper-cloud'))
}
// 多屏幕-Bus司机端
// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus'))
// // 多屏幕-Bus乘客端
@@ -74,6 +64,5 @@ project.dependencies {
//
// // 清扫车-多屏幕
// fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper'))
}
}

32
app/script/productFlavors/sweeperCloud.gradle
View File

@@ -1,32 +0,0 @@
project.android.productFlavors {
// 清扫车业务
sweeperCloud {
dimension "product"
manifestPlaceholders = [
// 标识
CHANNEL_VALUE_HEAD: "Sweeper",
// 在启动的时候把Task给清空
ACTIVITY_ROOT : true,
// Activity的朝向
SCREEN_ORIENTATION:"landscape",
]
// ①标识
buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\""
// ②连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
if(isCurrentFlavors("sweeperCloud")){
project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper-cloud'))
}
}
}