From 1f8ba19603b19dfd8d37fee8e36f80aed87b0115 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Mar 2023 14:27:34 +0800 Subject: [PATCH 01/15] =?UTF-8?q?[m1]=20[flavors=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BAjson=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/flavorfilter/flavors.json | 26 +++++++++++++ app/flavorfilter/flavorsFilterConfig.gradle | 43 +++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 app/flavorfilter/flavors.json create mode 100644 app/flavorfilter/flavorsFilterConfig.gradle diff --git a/app/build.gradle b/app/build.gradle index fac1a5d598..5a97fdd955 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -295,7 +295,7 @@ android { apply from: "./productFlavors/ochDriverM1.gradle" apply from: "./productFlavors/ochPassengerM1.gradle" apply from: "./productFlavors/fMultiDisplaySweeper.gradle" - apply from: "./productFlavors/flavorsFilterConfig.gradle" + apply from: "./flavorfilter/flavorsFilterConfig.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' diff --git a/app/flavorfilter/flavors.json b/app/flavorfilter/flavors.json new file mode 100644 index 0000000000..9b0a90b4a1 --- /dev/null +++ b/app/flavorfilter/flavors.json @@ -0,0 +1,26 @@ +{ + "mogo": { + "noop" :["fPadLenovo"], + "sweeper" :["fOchSweeper"], + "shuttle" :["fOchShuttle","fOchShuttlePassenger"], + "taxi" :["fOchTaxi","fOchTaxiPassenger","fMultiDisplayOchTaxi"], + "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], + "charter" :["ochDriverM1","ochPassengerM1"] + }, + "dali": { + "noop" :[""], + "sweeper" :[""], + "shuttle" :["fOchShuttle","fOchShuttlePassenger"], + "taxi" :[], + "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], + "charter" :["ochDriverM1","ochPassengerM1"] + }, + "yantai": { + "noop" :[""], + "sweeper" :["fOchSweeper"], + "shuttle" :["fOchShuttle","fOchShuttlePassenger"], + "taxi" :[], + "bus" :[], + "charter" :["ochDriverM1","ochPassengerM1"] + } +} \ No newline at end of file diff --git a/app/flavorfilter/flavorsFilterConfig.gradle b/app/flavorfilter/flavorsFilterConfig.gradle new file mode 100644 index 0000000000..508cac8b70 --- /dev/null +++ b/app/flavorfilter/flavorsFilterConfig.gradle @@ -0,0 +1,43 @@ +import groovy.json.JsonSlurper + + +File file = new File("${rootDir}/app/flavorfilter/flavors.json") +def jsonSlurper = new JsonSlurper() +// 解析json +def config = jsonSlurper.parse(file) + +project.android.variantFilter { variant -> + def names = variant.flavors*.name + //要检查特定的构建类型，请使用variant.buildType.name ==“ ” + def projectContain = true + config.each { project,value -> + if(names.contains(project)){ + projectContain = false + def productContain = true + value.each{product,vehicles-> + if(names.contains(product)){ + productContain =false + def vehicleContain = true + vehicles.each{vehicle-> + if (names.contains(vehicle)) { + println "need $names" + vehicleContain = false + } + } + if(vehicleContain){ + setIgnore(true) + } + } + } + if(productContain){ + setIgnore(true) + } + } + } + if(projectContain){ + setIgnore(true) + } +} + + + From 4b0fa8595b6d2e5561d3612428ddbc464bb62e47 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Mar 2023 16:38:48 +0800 Subject: [PATCH 02/15] =?UTF-8?q?[gradle]=20[=E5=B7=A5=E6=8E=A7=E6=9C=BAip?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/productFlavors/fMultiDisplaySweeper.gradle | 2 +- app/productFlavors/fOchBusPassenger.gradle | 2 +- app/productFlavors/fOchBusPassengerM2.gradle | 2 +- app/productFlavors/fOchShuttle.gradle | 2 +- app/productFlavors/fOchShuttlePassenger.gradle | 2 +- app/productFlavors/fOchTaxiPassenger.gradle | 2 +- app/productFlavors/ochPassengerM1.gradle | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/productFlavors/fMultiDisplaySweeper.gradle index 4dddc88a45..654193e687 100644 --- a/app/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/productFlavors/fMultiDisplaySweeper.gradle @@ -38,7 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/productFlavors/fOchBusPassenger.gradle index 5a585b833b..4f57bfe688 100644 --- a/app/productFlavors/fOchBusPassenger.gradle +++ b/app/productFlavors/fOchBusPassenger.gradle @@ -33,7 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JL\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/productFlavors/fOchBusPassengerM2.gradle index b298278764..f416a6bbbc 100644 --- a/app/productFlavors/fOchBusPassengerM2.gradle +++ b/app/productFlavors/fOchBusPassengerM2.gradle @@ -33,7 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_M2\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/productFlavors/fOchShuttle.gradle b/app/productFlavors/fOchShuttle.gradle index b3290c6685..8081717b7d 100644 --- a/app/productFlavors/fOchShuttle.gradle +++ b/app/productFlavors/fOchShuttle.gradle @@ -34,7 +34,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/productFlavors/fOchShuttlePassenger.gradle index 035eef12a3..b373b06e28 100644 --- a/app/productFlavors/fOchShuttlePassenger.gradle +++ b/app/productFlavors/fOchShuttlePassenger.gradle @@ -34,7 +34,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/fOchTaxiPassenger.gradle b/app/productFlavors/fOchTaxiPassenger.gradle index a762c8f8c8..92902d2337 100644 --- a/app/productFlavors/fOchTaxiPassenger.gradle +++ b/app/productFlavors/fOchTaxiPassenger.gradle @@ -38,7 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/productFlavors/ochPassengerM1.gradle b/app/productFlavors/ochPassengerM1.gradle index 2121de231e..54795fddfb 100644 --- a/app/productFlavors/ochPassengerM1.gradle +++ b/app/productFlavors/ochPassengerM1.gradle @@ -38,7 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Passenger_M1\"" // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 From 856120c3b291a7d38b46702a56c7413f7768f80b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 14:50:26 +0800 Subject: [PATCH 03/15] =?UTF-8?q?[gradle]=20[=E6=96=87=E4=BB=B6=E6=94=B6?= =?UTF-8?q?=E9=9B=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 32 ++-- app/productFlavors/flavorsFilterConfig.gradle | 167 ------------------ app/{ => script}/flavorfilter/flavors.json | 0 .../flavorfilter/flavorsFilterConfig.gradle | 2 +- app/{ => script}/functions/README.md | 0 app/{ => script}/functions/och.gradle | 0 app/{ => script}/productFlavors/README.md | 0 .../productFlavors/fMultiDisplayOchBus.gradle | 0 .../fMultiDisplayOchTaxi.gradle | 0 .../fMultiDisplaySweeper.gradle | 0 .../productFlavors/fOchBus.gradle | 0 .../productFlavors/fOchBusPassenger.gradle | 0 .../productFlavors/fOchBusPassengerM2.gradle | 0 .../productFlavors/fOchShuttle.gradle | 0 .../fOchShuttlePassenger.gradle | 0 .../productFlavors/fOchSweeper.gradle | 0 .../productFlavors/fOchTaxi.gradle | 0 .../productFlavors/fOchTaxiPassenger.gradle | 0 .../productFlavors/fPadLenovo.gradle | 0 .../productFlavors/ochDriverM1.gradle | 0 .../productFlavors/ochPassengerM1.gradle | 0 21 files changed, 17 insertions(+), 184 deletions(-) delete mode 100644 app/productFlavors/flavorsFilterConfig.gradle rename app/{ => script}/flavorfilter/flavors.json (100%) rename app/{ => script}/flavorfilter/flavorsFilterConfig.gradle (94%) rename app/{ => script}/functions/README.md (100%) rename app/{ => script}/functions/och.gradle (100%) rename app/{ => script}/productFlavors/README.md (100%) rename app/{ => script}/productFlavors/fMultiDisplayOchBus.gradle (100%) rename app/{ => script}/productFlavors/fMultiDisplayOchTaxi.gradle (100%) rename app/{ => script}/productFlavors/fMultiDisplaySweeper.gradle (100%) rename app/{ => script}/productFlavors/fOchBus.gradle (100%) rename app/{ => script}/productFlavors/fOchBusPassenger.gradle (100%) rename app/{ => script}/productFlavors/fOchBusPassengerM2.gradle (100%) rename app/{ => script}/productFlavors/fOchShuttle.gradle (100%) rename app/{ => script}/productFlavors/fOchShuttlePassenger.gradle (100%) rename app/{ => script}/productFlavors/fOchSweeper.gradle (100%) rename app/{ => script}/productFlavors/fOchTaxi.gradle (100%) rename app/{ => script}/productFlavors/fOchTaxiPassenger.gradle (100%) rename app/{ => script}/productFlavors/fPadLenovo.gradle (100%) rename app/{ => script}/productFlavors/ochDriverM1.gradle (100%) rename app/{ => script}/productFlavors/ochPassengerM1.gradle (100%) diff --git a/app/build.gradle b/app/build.gradle index 5a97fdd955..518f0d787f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -280,22 +280,22 @@ android { } // 配置不同渠道参数，直接影响功能完整度 - apply from: "./productFlavors/fPadLenovo.gradle" - apply from: "./productFlavors/fOchBus.gradle" - apply from: "./productFlavors/fOchShuttle.gradle" - apply from: "./productFlavors/fOchTaxi.gradle" - apply from: "./productFlavors/fOchBusPassenger.gradle" - apply from: "./productFlavors/fOchBusPassengerM2.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: "./script/productFlavors/fPadLenovo.gradle" + apply from: "./script/productFlavors/fOchBus.gradle" + apply from: "./script/productFlavors/fOchShuttle.gradle" + apply from: "./script/productFlavors/fOchTaxi.gradle" + apply from: "./script/productFlavors/fOchBusPassenger.gradle" + apply from: "./script/productFlavors/fOchBusPassengerM2.gradle" + apply from: "./script/productFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/productFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/productFlavors/fOchSweeper.gradle" + apply from: "./script/productFlavors/fMultiDisplayOchBus.gradle" + apply from: "./script/productFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./productFlavors/ochDriverM1.gradle" - apply from: "./productFlavors/ochPassengerM1.gradle" - apply from: "./productFlavors/fMultiDisplaySweeper.gradle" - apply from: "./flavorfilter/flavorsFilterConfig.gradle" + apply from: "./script/productFlavors/ochDriverM1.gradle" + apply from: "./script/productFlavors/ochPassengerM1.gradle" + apply from: "./script/productFlavors/fMultiDisplaySweeper.gradle" + apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' @@ -346,7 +346,7 @@ dependencies { androidTestImplementation project(':core:mogo-core-res') - apply from: "./functions/och.gradle" + apply from: "./script/functions/och.gradle" androidTestImplementation rootProject.ext.dependencies.androidx_test_core androidTestImplementation rootProject.ext.dependencies.androidx_test_core_ktx diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle deleted file mode 100644 index e4955fa1a0..0000000000 --- a/app/productFlavors/flavorsFilterConfig.gradle +++ /dev/null @@ -1,167 +0,0 @@ - -project.android.variantFilter { variant -> - def names = variant.flavors*.name - //要检查特定的构建类型，请使用variant.buildType.name ==“ ” - 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("fOchShuttlePassenger")) { - } 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 if (names.contains("fOchBusPassengerM2")) { - } 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("fOchShuttlePassenger")) { - } 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 if (names.contains("fOchBusPassengerM2")) { - } 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) - } -} - - - diff --git a/app/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json similarity index 100% rename from app/flavorfilter/flavors.json rename to app/script/flavorfilter/flavors.json diff --git a/app/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle similarity index 94% rename from app/flavorfilter/flavorsFilterConfig.gradle rename to app/script/flavorfilter/flavorsFilterConfig.gradle index 508cac8b70..83539d1a0f 100644 --- a/app/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -1,7 +1,7 @@ import groovy.json.JsonSlurper -File file = new File("${rootDir}/app/flavorfilter/flavors.json") +File file = new File("${rootDir}/app/script/flavorfilter/flavors.json") def jsonSlurper = new JsonSlurper() // 解析json def config = jsonSlurper.parse(file) diff --git a/app/functions/README.md b/app/script/functions/README.md similarity index 100% rename from app/functions/README.md rename to app/script/functions/README.md diff --git a/app/functions/och.gradle b/app/script/functions/och.gradle similarity index 100% rename from app/functions/och.gradle rename to app/script/functions/och.gradle diff --git a/app/productFlavors/README.md b/app/script/productFlavors/README.md similarity index 100% rename from app/productFlavors/README.md rename to app/script/productFlavors/README.md diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/script/productFlavors/fMultiDisplayOchBus.gradle similarity index 100% rename from app/productFlavors/fMultiDisplayOchBus.gradle rename to app/script/productFlavors/fMultiDisplayOchBus.gradle diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/script/productFlavors/fMultiDisplayOchTaxi.gradle similarity index 100% rename from app/productFlavors/fMultiDisplayOchTaxi.gradle rename to app/script/productFlavors/fMultiDisplayOchTaxi.gradle diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/script/productFlavors/fMultiDisplaySweeper.gradle similarity index 100% rename from app/productFlavors/fMultiDisplaySweeper.gradle rename to app/script/productFlavors/fMultiDisplaySweeper.gradle diff --git a/app/productFlavors/fOchBus.gradle b/app/script/productFlavors/fOchBus.gradle similarity index 100% rename from app/productFlavors/fOchBus.gradle rename to app/script/productFlavors/fOchBus.gradle diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/script/productFlavors/fOchBusPassenger.gradle similarity index 100% rename from app/productFlavors/fOchBusPassenger.gradle rename to app/script/productFlavors/fOchBusPassenger.gradle diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/script/productFlavors/fOchBusPassengerM2.gradle similarity index 100% rename from app/productFlavors/fOchBusPassengerM2.gradle rename to app/script/productFlavors/fOchBusPassengerM2.gradle diff --git a/app/productFlavors/fOchShuttle.gradle b/app/script/productFlavors/fOchShuttle.gradle similarity index 100% rename from app/productFlavors/fOchShuttle.gradle rename to app/script/productFlavors/fOchShuttle.gradle diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/script/productFlavors/fOchShuttlePassenger.gradle similarity index 100% rename from app/productFlavors/fOchShuttlePassenger.gradle rename to app/script/productFlavors/fOchShuttlePassenger.gradle diff --git a/app/productFlavors/fOchSweeper.gradle b/app/script/productFlavors/fOchSweeper.gradle similarity index 100% rename from app/productFlavors/fOchSweeper.gradle rename to app/script/productFlavors/fOchSweeper.gradle diff --git a/app/productFlavors/fOchTaxi.gradle b/app/script/productFlavors/fOchTaxi.gradle similarity index 100% rename from app/productFlavors/fOchTaxi.gradle rename to app/script/productFlavors/fOchTaxi.gradle diff --git a/app/productFlavors/fOchTaxiPassenger.gradle b/app/script/productFlavors/fOchTaxiPassenger.gradle similarity index 100% rename from app/productFlavors/fOchTaxiPassenger.gradle rename to app/script/productFlavors/fOchTaxiPassenger.gradle diff --git a/app/productFlavors/fPadLenovo.gradle b/app/script/productFlavors/fPadLenovo.gradle similarity index 100% rename from app/productFlavors/fPadLenovo.gradle rename to app/script/productFlavors/fPadLenovo.gradle diff --git a/app/productFlavors/ochDriverM1.gradle b/app/script/productFlavors/ochDriverM1.gradle similarity index 100% rename from app/productFlavors/ochDriverM1.gradle rename to app/script/productFlavors/ochDriverM1.gradle diff --git a/app/productFlavors/ochPassengerM1.gradle b/app/script/productFlavors/ochPassengerM1.gradle similarity index 100% rename from app/productFlavors/ochPassengerM1.gradle rename to app/script/productFlavors/ochPassengerM1.gradle From 7c54fb20eaab5e2391ffeeda19c8fe0bd7b02d01 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 20:55:13 +0800 Subject: [PATCH 04/15] =?UTF-8?q?[gradle]=20[=E6=B7=BB=E5=8A=A0role=20flav?= =?UTF-8?q?ors]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 63 +++++++------------ app/script/productFlavors/bus.gradle | 9 +++ app/script/productFlavors/charter.gradle | 10 +++ app/script/productFlavors/noop.gradle | 9 +++ app/script/productFlavors/shuttle.gradle | 10 +++ app/script/productFlavors/sweeper.gradle | 10 +++ app/script/productFlavors/taxi.gradle | 10 +++ app/script/roleFlavors/driver.gradle | 6 ++ app/script/roleFlavors/passenger.gradle | 7 +++ .../README.md | 0 .../fMultiDisplayOchBus.gradle | 4 +- .../fMultiDisplayOchTaxi.gradle | 3 +- .../fMultiDisplaySweeper.gradle | 3 +- .../fOchBus.gradle | 2 - .../fOchBusPassenger.gradle | 2 - .../fOchBusPassengerM2.gradle | 2 - .../fOchShuttle.gradle | 3 +- .../fOchShuttlePassenger.gradle | 3 +- .../fOchSweeper.gradle | 2 - .../fOchTaxi.gradle | 3 +- .../fOchTaxiPassenger.gradle | 3 +- .../fPadLenovo.gradle | 3 +- .../ochDriverM1.gradle | 3 +- .../ochPassengerM1.gradle | 3 +- 24 files changed, 105 insertions(+), 68 deletions(-) create mode 100644 app/script/productFlavors/bus.gradle create mode 100644 app/script/productFlavors/charter.gradle create mode 100644 app/script/productFlavors/noop.gradle create mode 100644 app/script/productFlavors/shuttle.gradle create mode 100644 app/script/productFlavors/sweeper.gradle create mode 100644 app/script/productFlavors/taxi.gradle create mode 100644 app/script/roleFlavors/driver.gradle create mode 100644 app/script/roleFlavors/passenger.gradle rename app/script/{productFlavors => vehicleFlavors}/README.md (100%) rename app/script/{productFlavors => vehicleFlavors}/fMultiDisplayOchBus.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fMultiDisplayOchTaxi.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fMultiDisplaySweeper.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchBus.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchBusPassenger.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchBusPassengerM2.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchShuttle.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchShuttlePassenger.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchSweeper.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchTaxi.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fOchTaxiPassenger.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/fPadLenovo.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/ochDriverM1.gradle (95%) rename app/script/{productFlavors => vehicleFlavors}/ochPassengerM1.gradle (95%) diff --git a/app/build.gradle b/app/build.gradle index 518f0d787f..79e18bf586 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -210,7 +210,7 @@ android { // 项目 business // 业务线 product // 车型 vehicle - flavorDimensions "project","product","vehicle" ,"basic", "env" + flavorDimensions "project","product","role","vehicle" ,"basic", "env" productFlavors { // launcher app launcher { @@ -239,31 +239,6 @@ android { buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\"" } - // 空业务 主要是给鹰眼使用 - noop { - dimension "product" - } - // 小巴车业务 - bus { - dimension "product" - } - // 出租车业务 - taxi { - dimension "product" - } - // 清扫车业务 - sweeper { - dimension "product" - } - // 接驳车业务 - shuttle{ - dimension "product" - } - // 包车业务 - charter{ - dimension "product" - } - // 配置网络环境，QA、线上、演示 qa { dimension "env" @@ -278,23 +253,31 @@ android { buildConfigField 'int', 'NET_ENV', '4' } } + apply from: "./script/roleFlavors/driver.gradle" + apply from: "./script/roleFlavors/passenger.gradle" + apply from: "./script/productFlavors/bus.gradle" + apply from: "./script/productFlavors/charter.gradle" + apply from: "./script/productFlavors/noop.gradle" + apply from: "./script/productFlavors/shuttle.gradle" + apply from: "./script/productFlavors/sweeper.gradle" + apply from: "./script/productFlavors/taxi.gradle" // 配置不同渠道参数，直接影响功能完整度 - apply from: "./script/productFlavors/fPadLenovo.gradle" - apply from: "./script/productFlavors/fOchBus.gradle" - apply from: "./script/productFlavors/fOchShuttle.gradle" - apply from: "./script/productFlavors/fOchTaxi.gradle" - apply from: "./script/productFlavors/fOchBusPassenger.gradle" - apply from: "./script/productFlavors/fOchBusPassengerM2.gradle" - apply from: "./script/productFlavors/fOchShuttlePassenger.gradle" - apply from: "./script/productFlavors/fOchTaxiPassenger.gradle" - apply from: "./script/productFlavors/fOchSweeper.gradle" - apply from: "./script/productFlavors/fMultiDisplayOchBus.gradle" - apply from: "./script/productFlavors/fMultiDisplayOchTaxi.gradle" + apply from: "./script/vehicleFlavors/fPadLenovo.gradle" + apply from: "./script/vehicleFlavors/fOchBus.gradle" + apply from: "./script/vehicleFlavors/fOchShuttle.gradle" + apply from: "./script/vehicleFlavors/fOchTaxi.gradle" + apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" + apply from: "./script/vehicleFlavors/fOchBusPassengerM2.gradle" + apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/vehicleFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/vehicleFlavors/fOchSweeper.gradle" + apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" + apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./script/productFlavors/ochDriverM1.gradle" - apply from: "./script/productFlavors/ochPassengerM1.gradle" - apply from: "./script/productFlavors/fMultiDisplaySweeper.gradle" + apply from: "./script/vehicleFlavors/ochDriverM1.gradle" + apply from: "./script/vehicleFlavors/ochPassengerM1.gradle" + apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle new file mode 100644 index 0000000000..4be88716bf --- /dev/null +++ b/app/script/productFlavors/bus.gradle @@ -0,0 +1,9 @@ +project.android.productFlavors { + bus { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle new file mode 100644 index 0000000000..5c4afa79cc --- /dev/null +++ b/app/script/productFlavors/charter.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 包车业务 + charter{ + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle new file mode 100644 index 0000000000..7ad6550b65 --- /dev/null +++ b/app/script/productFlavors/noop.gradle @@ -0,0 +1,9 @@ +project.android.productFlavors { + // 空业务 主要是给鹰眼使用 + noop { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle new file mode 100644 index 0000000000..5ca041b516 --- /dev/null +++ b/app/script/productFlavors/shuttle.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 接驳车业务 + shuttle{ + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle new file mode 100644 index 0000000000..614e731b57 --- /dev/null +++ b/app/script/productFlavors/sweeper.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 清扫车业务 + sweeper { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle new file mode 100644 index 0000000000..065523cc61 --- /dev/null +++ b/app/script/productFlavors/taxi.gradle @@ -0,0 +1,10 @@ +project.android.productFlavors { + // 出租车业务 + taxi { + dimension "product" + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" + + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + } +} \ No newline at end of file diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle new file mode 100644 index 0000000000..277f53f53f --- /dev/null +++ b/app/script/roleFlavors/driver.gradle @@ -0,0 +1,6 @@ +project.android.productFlavors { + driver { + dimension "role" + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + } +} \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle new file mode 100644 index 0000000000..37e4581034 --- /dev/null +++ b/app/script/roleFlavors/passenger.gradle @@ -0,0 +1,7 @@ +project.android.productFlavors { + // 包车业务 + passenger{ + dimension "role" + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" + } +} \ No newline at end of file diff --git a/app/script/productFlavors/README.md b/app/script/vehicleFlavors/README.md similarity index 100% rename from app/script/productFlavors/README.md rename to app/script/vehicleFlavors/README.md diff --git a/app/script/productFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle similarity index 95% rename from app/script/productFlavors/fMultiDisplayOchBus.gradle rename to app/script/vehicleFlavors/fMultiDisplayOchBus.gradle index 6705e54bc7..43c7d267e6 100644 --- a/app/script/productFlavors/fMultiDisplayOchBus.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle @@ -34,8 +34,8 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JLKV\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle similarity index 95% rename from app/script/productFlavors/fMultiDisplayOchTaxi.gradle rename to app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle index 2e9691dca8..cea46ef0a3 100644 --- a/app/script/productFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle @@ -36,8 +36,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle similarity index 95% rename from app/script/productFlavors/fMultiDisplaySweeper.gradle rename to app/script/vehicleFlavors/fMultiDisplaySweeper.gradle index 654193e687..e583e4a173 100644 --- a/app/script/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchBus.gradle b/app/script/vehicleFlavors/fOchBus.gradle similarity index 95% rename from app/script/productFlavors/fOchBus.gradle rename to app/script/vehicleFlavors/fOchBus.gradle index 09683e1c91..ae90dde64a 100644 --- a/app/script/productFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/fOchBus.gradle @@ -37,8 +37,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle similarity index 95% rename from app/script/productFlavors/fOchBusPassenger.gradle rename to app/script/vehicleFlavors/fOchBusPassenger.gradle index 4f57bfe688..b7ca01c603 100644 --- a/app/script/productFlavors/fOchBusPassenger.gradle +++ b/app/script/vehicleFlavors/fOchBusPassenger.gradle @@ -32,8 +32,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchBusPassengerM2.gradle b/app/script/vehicleFlavors/fOchBusPassengerM2.gradle similarity index 95% rename from app/script/productFlavors/fOchBusPassengerM2.gradle rename to app/script/vehicleFlavors/fOchBusPassengerM2.gradle index f416a6bbbc..6508720305 100644 --- a/app/script/productFlavors/fOchBusPassengerM2.gradle +++ b/app/script/vehicleFlavors/fOchBusPassengerM2.gradle @@ -32,8 +32,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_M2\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/script/productFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle similarity index 95% rename from app/script/productFlavors/fOchShuttle.gradle rename to app/script/vehicleFlavors/fOchShuttle.gradle index 8081717b7d..66572fecc2 100644 --- a/app/script/productFlavors/fOchShuttle.gradle +++ b/app/script/vehicleFlavors/fOchShuttle.gradle @@ -33,8 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' diff --git a/app/script/productFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle similarity index 95% rename from app/script/productFlavors/fOchShuttlePassenger.gradle rename to app/script/vehicleFlavors/fOchShuttlePassenger.gradle index b373b06e28..cb5f444deb 100644 --- a/app/script/productFlavors/fOchShuttlePassenger.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle @@ -33,8 +33,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/fOchSweeper.gradle similarity index 95% rename from app/script/productFlavors/fOchSweeper.gradle rename to app/script/vehicleFlavors/fOchSweeper.gradle index 273ff178c0..489de575e9 100644 --- a/app/script/productFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/fOchSweeper.gradle @@ -37,8 +37,6 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Sweeper_Driver_FT\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchTaxi.gradle b/app/script/vehicleFlavors/fOchTaxi.gradle similarity index 95% rename from app/script/productFlavors/fOchTaxi.gradle rename to app/script/vehicleFlavors/fOchTaxi.gradle index 424280b7f3..516d1de504 100644 --- a/app/script/productFlavors/fOchTaxi.gradle +++ b/app/script/vehicleFlavors/fOchTaxi.gradle @@ -38,8 +38,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fOchTaxiPassenger.gradle b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle similarity index 95% rename from app/script/productFlavors/fOchTaxiPassenger.gradle rename to app/script/vehicleFlavors/fOchTaxiPassenger.gradle index 92902d2337..fdfe6b8a44 100644 --- a/app/script/productFlavors/fOchTaxiPassenger.gradle +++ b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle similarity index 95% rename from app/script/productFlavors/fPadLenovo.gradle rename to app/script/vehicleFlavors/fPadLenovo.gradle index f9cbdfbc63..35ca4212cf 100644 --- a/app/script/productFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -34,8 +34,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"FPad_Noop_Base\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/ochDriverM1.gradle b/app/script/vehicleFlavors/ochDriverM1.gradle similarity index 95% rename from app/script/productFlavors/ochDriverM1.gradle rename to app/script/vehicleFlavors/ochDriverM1.gradle index 667e7af6c6..c74762f57d 100644 --- a/app/script/productFlavors/ochDriverM1.gradle +++ b/app/script/vehicleFlavors/ochDriverM1.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 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' // 构建的是否要动态更换模型 diff --git a/app/script/productFlavors/ochPassengerM1.gradle b/app/script/vehicleFlavors/ochPassengerM1.gradle similarity index 95% rename from app/script/productFlavors/ochPassengerM1.gradle rename to app/script/vehicleFlavors/ochPassengerM1.gradle index 54795fddfb..3865f502fd 100644 --- a/app/script/productFlavors/ochPassengerM1.gradle +++ b/app/script/vehicleFlavors/ochPassengerM1.gradle @@ -37,8 +37,7 @@ project.android.productFlavors { // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Charter_Passenger_M1\"" - // 连接的工控机IP地址 - buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 From d35ba980766db1b958199998504407f283647f25 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 27 Mar 2023 11:39:03 +0800 Subject: [PATCH 05/15] =?UTF-8?q?[gradle]=20[taxi=E3=80=81charter=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 14 ++-- app/script/flavorfilter/flavors.json | 69 ++++++++++++++----- .../flavorfilter/flavorsFilterConfig.gradle | 30 +++++--- app/script/functions/och.gradle | 8 +-- app/script/productFlavors/bus.gradle | 8 ++- app/script/productFlavors/charter.gradle | 26 +++++++ app/script/productFlavors/noop.gradle | 5 ++ app/script/productFlavors/shuttle.gradle | 5 ++ app/script/productFlavors/sweeper.gradle | 5 ++ app/script/productFlavors/taxi.gradle | 23 +++++++ app/script/roleFlavors/driver.gradle | 28 ++++++++ app/script/roleFlavors/passenger.gradle | 28 +++++++- app/script/utils.gradle | 35 ++++++++++ .../vehicleFlavors/fMultiDisplayOchBus.gradle | 27 +------- .../fMultiDisplayOchTaxi.gradle | 29 +------- .../fMultiDisplaySweeper.gradle | 28 +------- app/script/vehicleFlavors/fOchBus.gradle | 28 +------- .../vehicleFlavors/fOchBusPassenger.gradle | 26 ++----- app/script/vehicleFlavors/fOchShuttle.gradle | 32 ++------- .../fOchShuttlePassenger.gradle | 29 ++------ .../fOchShuttlePassengerM2.gradle | 26 ++----- app/script/vehicleFlavors/fOchSweeper.gradle | 30 +------- app/script/vehicleFlavors/fOchTaxi.gradle | 56 --------------- .../vehicleFlavors/fOchTaxiPassenger.gradle | 55 --------------- app/script/vehicleFlavors/fPadLenovo.gradle | 26 ++----- app/script/vehicleFlavors/ochDFHQ.gradle | 38 ++++++++++ app/script/vehicleFlavors/ochDriverM1.gradle | 54 --------------- app/script/vehicleFlavors/ochM1.gradle | 35 ++++++++++ .../vehicleFlavors/ochPassengerM1.gradle | 54 --------------- app/src/main/AndroidManifest.xml | 2 +- .../mogo/launcher/startup/ConfigStartUp.kt | 2 +- 31 files changed, 352 insertions(+), 509 deletions(-) create mode 100644 app/script/utils.gradle delete mode 100644 app/script/vehicleFlavors/fOchTaxi.gradle delete mode 100644 app/script/vehicleFlavors/fOchTaxiPassenger.gradle create mode 100644 app/script/vehicleFlavors/ochDFHQ.gradle delete mode 100644 app/script/vehicleFlavors/ochDriverM1.gradle create mode 100644 app/script/vehicleFlavors/ochM1.gradle delete mode 100644 app/script/vehicleFlavors/ochPassengerM1.gradle diff --git a/app/build.gradle b/app/build.gradle index 8a3f83c949..be466e31ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,9 @@ android { shrinkResources false signingConfig signingConfigs.release manifestPlaceholders = [ - MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") + MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION"), + // 高德地图鉴权信息 + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, ] } release { @@ -189,7 +191,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' manifestPlaceholders = [ - MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") + MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION"), + // 高德地图鉴权信息 + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, ] } } @@ -266,17 +270,15 @@ android { apply from: "./script/vehicleFlavors/fPadLenovo.gradle" apply from: "./script/vehicleFlavors/fOchBus.gradle" apply from: "./script/vehicleFlavors/fOchShuttle.gradle" - apply from: "./script/vehicleFlavors/fOchTaxi.gradle" apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" apply from: "./script/vehicleFlavors/fOchShuttlePassengerM2.gradle" apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" - apply from: "./script/vehicleFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/fOchSweeper.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./script/vehicleFlavors/ochDriverM1.gradle" - apply from: "./script/vehicleFlavors/ochPassengerM1.gradle" + apply from: "./script/vehicleFlavors/ochM1.gradle" apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 9b0a90b4a1..8625c4148c 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -1,26 +1,59 @@ { "mogo": { - "noop" :["fPadLenovo"], - "sweeper" :["fOchSweeper"], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :["fOchTaxi","fOchTaxiPassenger","fMultiDisplayOchTaxi"], - "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" :{ + "driver":["fPadLenovo"] + }, + "sweeper" :{ + "driver": ["fOchSweeper"] + }, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :{ + "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], + "passenger": ["ochDFHQ"] + }, + "bus" :{ + "driver": ["fOchBus","fMultiDisplayOchBus"], + "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + }, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } }, "dali": { - "noop" :[""], - "sweeper" :[""], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :[], - "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" : null, + "sweeper" :null, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :null, + "bus" :{ + "driver": ["fOchBus","fMultiDisplayOchBus"], + "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + }, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } }, "yantai": { - "noop" :[""], - "sweeper" :["fOchSweeper"], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :[], - "bus" :[], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" :null, + "sweeper" :{ + "driver": ["fOchSweeper"] + }, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :null, + "bus" :null, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } } } \ No newline at end of file diff --git a/app/script/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle index 83539d1a0f..87c0a86212 100644 --- a/app/script/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -9,22 +9,32 @@ def config = jsonSlurper.parse(file) project.android.variantFilter { variant -> def names = variant.flavors*.name //要检查特定的构建类型，请使用variant.buildType.name ==“ ” +// println "------$names" def projectContain = true - config.each { project,value -> - if(names.contains(project)){ + config.each { projectKey,projectValue -> + if(names.contains(projectKey)){ projectContain = false def productContain = true - value.each{product,vehicles-> - if(names.contains(product)){ + projectValue.each{productKey,productValue-> + if(names.contains(productKey)){ productContain =false - def vehicleContain = true - vehicles.each{vehicle-> - if (names.contains(vehicle)) { - println "need $names" - vehicleContain = false + def roleContain = true + productValue.each{roleKey,roleValue-> + if(names.contains(roleKey)){ + roleContain =false + def vehicleContain = true + roleValue.each{vehicleValue-> + if (names.contains(vehicleValue)) { + println "need $names" + vehicleContain = false + } + } + if(vehicleContain){ + setIgnore(true) + } } } - if(vehicleContain){ + if(roleContain){ setIgnore(true) } } diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 242f2b6437..91ea6b8756 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -42,13 +42,13 @@ project.dependencies { // 包车 - ochDriverM1Implementation (project(':OCH:mogo-och-charter')) - ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) +// ochDriverM1Implementation (project(':OCH:mogo-och-charter')) +// ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) // taxi司机端 - fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) +// fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) // taxi乘客端 - fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) +// fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // 多屏幕-Bus司机端 fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 4be88716bf..81167792a5 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -1,9 +1,15 @@ project.android.productFlavors { bus { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Bus", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" } -} \ No newline at end of file +} + diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 5c4afa79cc..8bbfe7d575 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -1,10 +1,36 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { // 包车业务 charter{ dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Charter", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + if(isCurrentFlavors("charter")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) + } + } + if(isPassenger()){ + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' + if(isCurrentFlavors("charter")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) + } + } } } \ No newline at end of file diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 7ad6550b65..d783019507 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 空业务 主要是给鹰眼使用 noop { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Noop", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 5ca041b516..f71bd4001d 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 接驳车业务 shuttle{ dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Shuttle", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" // 连接的工控机IP地址 diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index 614e731b57..c22cc7fc81 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 清扫车业务 sweeper { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Sweeper", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" // 连接的工控机IP地址 diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 065523cc61..e28d43a682 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -2,9 +2,32 @@ project.android.productFlavors { // 出租车业务 taxi { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Taxi", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + + + if(isDriver()){ + if(isCurrentFlavors("taxi")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + } + } + if(isPassenger()){ + if(isCurrentFlavors("taxi")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + } + } } } \ No newline at end of file diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle index 277f53f53f..575ed25af7 100644 --- a/app/script/roleFlavors/driver.gradle +++ b/app/script/roleFlavors/driver.gradle @@ -1,6 +1,34 @@ project.android.productFlavors { driver { dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Driver", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index 37e4581034..d44c0c5c28 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -1,7 +1,33 @@ project.android.productFlavors { // 包车业务 - passenger{ + passenger { dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Passenger", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle new file mode 100644 index 0000000000..0f337cc3ff --- /dev/null +++ b/app/script/utils.gradle @@ -0,0 +1,35 @@ +boolean isDriver() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("Driver") | s.contains("driver")) { + return true + } + } + return false +} + +boolean isPassenger() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("Passenger") | s.contains("passenger")) { + return true + } + } + return false +} + +boolean isCurrentFlavors(String flavors){ + for (String s : gradle.startParameter.taskNames) { + + def lowerCase = flavors.toLowerCase() + if (s.toLowerCase().contains(lowerCase)) { + return true + } + } + return false +} + +ext { + isPassenger = this.&isPassenger + isDriver = this.&isDriver + isCurrentFlavors = this.&isCurrentFlavors + +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle index 43c7d267e6..f8a5c5c064 100644 --- a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle @@ -1,43 +1,20 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplayOchBus { - 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的m1对应 matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fMultiDisplayOchBus", + CHANNEL_VALUE_TAIL : "JLKV", 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_Driver_JLKV\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JLKV\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle index cea46ef0a3..70724d6074 100644 --- a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle @@ -1,50 +1,27 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplayOchTaxi { - 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" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fMultiDisplayOchTaxi", + CHANNEL_VALUE_TAIL : "DFHQ", // 在启动的时候把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', "\"Taxi_Driver_DFHQ\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" - // 构建的是否是演示（美化）模式 - 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' diff --git a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle index e583e4a173..1cdc26af8e 100644 --- a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle +++ b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle @@ -1,45 +1,21 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplaySweeper { - 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" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fMultiDisplaySweeper", + CHANNEL_VALUE_TAIL : "FT", // 在启动的时候把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', "\"Taxi_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' diff --git a/app/script/vehicleFlavors/fOchBus.gradle b/app/script/vehicleFlavors/fOchBus.gradle index ae90dde64a..e8886f42eb 100644 --- a/app/script/vehicleFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/fOchBus.gradle @@ -1,44 +1,22 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchBus { - 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 = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBus", + CHANNEL_VALUE_TAIL : "JL", // 在启动的时候把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', "\"Bus_Driver_JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle index b7ca01c603..89c0ac0559 100644 --- a/app/script/vehicleFlavors/fOchBusPassenger.gradle +++ b/app/script/vehicleFlavors/fOchBusPassenger.gradle @@ -1,39 +1,21 @@ 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", + CHANNEL_VALUE_TAIL : "JL", 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\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle index 4d529374d3..39e37ccbd0 100644 --- a/app/script/vehicleFlavors/fOchShuttle.gradle +++ b/app/script/vehicleFlavors/fOchShuttle.gradle @@ -1,44 +1,20 @@ 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, + CHANNEL_VALUE_TAIL : "JL", + 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\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' diff --git a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle index 8465694bb4..db2eba2f1e 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle @@ -1,43 +1,22 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchShuttlePassenger { - 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" matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fOchShuttlePassenger", + CHANNEL_VALUE_TAIL: "JL", 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', "\"Shuttle_Passenger_JL\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle b/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle index 980f739d7b..840e3b2050 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle @@ -1,39 +1,21 @@ 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", + CHANNEL_VALUE_TAIL : "M2", 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', "\"Bus_Passenger_M2\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M2\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' diff --git a/app/script/vehicleFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/fOchSweeper.gradle index 489de575e9..3c377ae261 100644 --- a/app/script/vehicleFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/fOchSweeper.gradle @@ -1,50 +1,26 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchSweeper { - 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" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchSweeper", + CHANNEL_VALUE_TAIL: "FT", // 在启动的时候把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', "\"Sweeper_Driver_FT\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' diff --git a/app/script/vehicleFlavors/fOchTaxi.gradle b/app/script/vehicleFlavors/fOchTaxi.gradle deleted file mode 100644 index 516d1de504..0000000000 --- a/app/script/vehicleFlavors/fOchTaxi.gradle +++ /dev/null @@ -1,56 +0,0 @@ -project.android.productFlavors { - - // 衡阳-联想Pad-网约车-出租车 - fOchTaxi { - 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" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchTaxi", - // 在启动的时候把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', "\"Taxi_Driver_DFHQ\"" - - // 构建的是否是演示（美化）模式 - 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' - - //Taxi不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchTaxiPassenger.gradle b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle deleted file mode 100644 index fdfe6b8a44..0000000000 --- a/app/script/vehicleFlavors/fOchTaxiPassenger.gradle +++ /dev/null @@ -1,55 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-出租车-乘客端 - fOchTaxiPassenger { - 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" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchTaxiPassenger", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : false, - // 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', "\"Taxi_Passenger_DFHQ\"" - - // 构建的是否是演示（美化）模式 - 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' - - //Taxi不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 35ca4212cf..3a1ad7c8ed 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -1,42 +1,24 @@ project.android.productFlavors { // 衡阳-联想Pad fPadLenovo { - 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" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL CHANNEL_VALUE : "fPadLenovo", + CHANNEL_VALUE_TAIL: "Noop", // 在启动的时候把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', "\"FPad_Noop_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"Noop\"" + - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle new file mode 100644 index 0000000000..45cf58cca2 --- /dev/null +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -0,0 +1,38 @@ +apply from: "./script/utils.gradle" + +project.android.productFlavors { + + // 衡阳-联想Pad-网约车-出租车 + ochDFHQ { + dimension "vehicle" + + // 配置AndroidManifest.xml中用到的参数 + manifestPlaceholders = [ + // BUGLY_APP_CHANNEL + CHANNEL_VALUE_TAIL: "DFHQ", + // Activity的朝向 + SCREEN_ORIENTATION: "landscape" + ] + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" + + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + //Taxi不能启动自驾的档位 + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' + + + if(isDriver()){ + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",true) + } + if(isPassenger()){ + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",false) + } + } + +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDriverM1.gradle b/app/script/vehicleFlavors/ochDriverM1.gradle deleted file mode 100644 index c74762f57d..0000000000 --- a/app/script/vehicleFlavors/ochDriverM1.gradle +++ /dev/null @@ -1,54 +0,0 @@ -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\"" - - // 构建的是否是演示（美化）模式 - 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' - - //M1不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle new file mode 100644 index 0000000000..b443d65735 --- /dev/null +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -0,0 +1,35 @@ +apply from: "./script/utils.gradle" + +project.android.productFlavors { + // 衡阳-联想Pad-网约车-小巴车 + ochM1 { + dimension "vehicle" + + // 配置AndroidManifest.xml中用到的参数 + manifestPlaceholders = [ + // BUGLY_APP_CHANNEL + CHANNEL_VALUE : "Charter_Driver_M1", + CHANNEL_VALUE_TAIL: "M1", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION: "landscape" + ] + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M1\"" + //M1不能启动自驾的档位 + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + if(isDriver()){ + matchingFallbacks = ['driverm1'] + } + if(isPassenger()){ + matchingFallbacks = ['m1'] + } + + } +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochPassengerM1.gradle b/app/script/vehicleFlavors/ochPassengerM1.gradle deleted file mode 100644 index 7d7873aeaa..0000000000 --- a/app/script/vehicleFlavors/ochPassengerM1.gradle +++ /dev/null @@ -1,54 +0,0 @@ -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\"" - - // 构建的是否是演示（美化）模式 - 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', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 93042f91d2..c147f4e189 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,7 @@ + android:value="${CHANNEL_VALUE_HEAD}_${CHANNEL_VALUE_BODY}_${CHANNEL_VALUE_TAIL}" /> Date: Wed, 29 Mar 2023 12:00:00 +0800 Subject: [PATCH 06/15] =?UTF-8?q?[gradle]=20[sweeper=E3=80=81bus=E3=80=81s?= =?UTF-8?q?huttle=20=E5=88=86=E7=A6=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/README.md | 6 ++-- app/build.gradle | 10 +++--- app/regroup.gradle | 12 +++---- app/script/flavorfilter/flavors.json | 24 +++++++------- app/script/functions/och.gradle | 18 +++++------ app/script/productFlavors/bus.gradle | 17 ++++++++++ app/script/productFlavors/shuttle.gradle | 17 ++++++++++ app/script/productFlavors/sweeper.gradle | 5 +++ app/script/productFlavors/taxi.gradle | 4 +++ .../vehicleFlavors/fOchBusPassenger.gradle | 31 ------------------ app/script/vehicleFlavors/fOchShuttle.gradle | 31 ------------------ .../fOchShuttlePassenger.gradle | 32 ------------------- app/script/vehicleFlavors/ochDFHQ.gradle | 11 +------ .../{fOchSweeper.gradle => ochFT.gradle} | 4 +-- .../{fOchBus.gradle => ochJL.gradle} | 5 +-- app/script/vehicleFlavors/ochM1.gradle | 2 +- ...ShuttlePassengerM2.gradle => ochM2.gradle} | 6 ++-- 17 files changed, 85 insertions(+), 150 deletions(-) delete mode 100644 app/script/vehicleFlavors/fOchBusPassenger.gradle delete mode 100644 app/script/vehicleFlavors/fOchShuttle.gradle delete mode 100644 app/script/vehicleFlavors/fOchShuttlePassenger.gradle rename app/script/vehicleFlavors/{fOchSweeper.gradle => ochFT.gradle} (94%) rename app/script/vehicleFlavors/{fOchBus.gradle => ochJL.gradle} (90%) rename app/script/vehicleFlavors/{fOchShuttlePassengerM2.gradle => ochM2.gradle} (91%) diff --git a/app/README.md b/app/README.md index 709e801e2f..a9c72cf527 100644 --- a/app/README.md +++ b/app/README.md @@ -45,8 +45,8 @@ | 车型 | 配置所在文件 | 档位 | 配置 | |:-|:-|:-|:-| | 东风、红旗 | fOchTaxi.gradle、fOchTaxiPassenger.gradle | P、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{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', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' | +| 金旅小巴 | ochJL.gradle、ochJL.gradle、ochJL.gradle、ochJL.gradle | N、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' | | M1 | fOchBusPassengerM1.gradle | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | -| M2 | fOchShuttlePassengerM2.gradle | N、P、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' | -| 清扫车 | fOchSweeper.gradle | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | +| M2 | ochM2.gradle | N、P、R | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' | +| 清扫车 | ochFT.gradle | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | | 开沃 | 暂无 | 不限制档位 | buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' | diff --git a/app/build.gradle b/app/build.gradle index be466e31ea..fd0c229540 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -268,13 +268,11 @@ android { apply from: "./script/productFlavors/taxi.gradle" // 配置不同渠道参数，直接影响功能完整度 apply from: "./script/vehicleFlavors/fPadLenovo.gradle" - apply from: "./script/vehicleFlavors/fOchBus.gradle" - apply from: "./script/vehicleFlavors/fOchShuttle.gradle" - apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" - apply from: "./script/vehicleFlavors/fOchShuttlePassengerM2.gradle" - apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/vehicleFlavors/ochJL.gradle" + apply from: "./script/vehicleFlavors/ochJL.gradle" + apply from: "./script/vehicleFlavors/ochM2.gradle" apply from: "./script/vehicleFlavors/ochDFHQ.gradle" - apply from: "./script/vehicleFlavors/fOchSweeper.gradle" + apply from: "./script/vehicleFlavors/ochFT.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 diff --git a/app/regroup.gradle b/app/regroup.gradle index d21831358a..8d0fdf84e7 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -3,14 +3,14 @@ afterEvaluate { def launcher = [ "fPadLenovo", - "fOchSweeper", + "ochFT", "fOchTaxi", - "fOchBus", - "fOchBusPassenger", + "ochJL", + "ochJL", "fOchBusPassengerM1", - "fOchShuttlePassengerM2", - "fOchShuttle", - "fOchShuttlePassenger", + "ochM2", + "ochJL", + "ochJL", "fOchTaxiPassenger", "MultiDisplayOchBus", "MultiDisplayOchTaxi"] diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 8625c4148c..341227aa67 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -4,19 +4,19 @@ "driver":["fPadLenovo"] }, "sweeper" :{ - "driver": ["fOchSweeper"] + "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["fOchShuttle"], - "passenger": ["fOchShuttlePassenger"] + "driver": ["ochJL"], + "passenger": ["ochJL","ochM2"] }, "taxi" :{ "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], "passenger": ["ochDFHQ"] }, "bus" :{ - "driver": ["fOchBus","fMultiDisplayOchBus"], - "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + "driver": ["ochJL","fMultiDisplayOchBus"], + "passenger": ["ochJL"] }, "charter" :{ "driver": ["ochM1"], @@ -27,13 +27,13 @@ "noop" : null, "sweeper" :null, "shuttle" :{ - "driver": ["fOchShuttle"], - "passenger": ["fOchShuttlePassenger"] + "driver": ["ochJL"], + "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :{ - "driver": ["fOchBus","fMultiDisplayOchBus"], - "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + "driver": ["ochJL","fMultiDisplayOchBus"], + "passenger": ["ochJL"] }, "charter" :{ "driver": ["ochM1"], @@ -43,11 +43,11 @@ "yantai": { "noop" :null, "sweeper" :{ - "driver": ["fOchSweeper"] + "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["fOchShuttle"], - "passenger": ["fOchShuttlePassenger"] + "driver": ["ochJL"], + "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :null, diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 91ea6b8756..2dac97319d 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -10,7 +10,7 @@ project.dependencies { // Bus乘客端 fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) - fOchShuttlePassengerM2Implementation(rootProject.ext.dependencies.mogoochbus) + ochM2Implementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) @@ -23,8 +23,8 @@ project.dependencies { fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) //接驳车司乘端 - fOchShuttleImplementation(rootProject.ext.dependencies.mogoochbus) - fOchShuttlePassengerImplementation(rootProject.ext.dependencies.mogoochbus) + ochJLImplementation(rootProject.ext.dependencies.mogoochbus) + ochJLImplementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) @@ -33,12 +33,12 @@ project.dependencies { } else { fPadLenovoImplementation (project(':OCH:mogo-och-noop')) // sweeper 清扫车 - fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) +// fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) // Bus司机端 - fOchBusImplementation (project(':OCH:mogo-och-bus')) + //fOchBusImplementation (project(':OCH:mogo-och-bus')) // Bus乘客端 - fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) + //fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) // 包车 @@ -57,9 +57,9 @@ project.dependencies { // 多屏幕-taxi司机端 //接驳车司乘端 - fOchShuttleImplementation (project(':OCH:mogo-och-shuttle')) - fOchShuttlePassengerImplementation (project(':OCH:mogo-och-shuttle-passenger')) - fOchShuttlePassengerM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) +// ochJLImplementation (project(':OCH:mogo-och-shuttle')) +// ochJLImplementation (project(':OCH:mogo-och-shuttle-passenger')) +// ochM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) // taxi司机端 fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 81167792a5..8aca69e63c 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -1,3 +1,5 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { bus { dimension "product" @@ -10,6 +12,21 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + if(isCurrentFlavors("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + } + } + if(isPassenger()){ + if(isCurrentFlavors("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } + } } } diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index f71bd4001d..36599728c1 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -1,3 +1,5 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { // 接驳车业务 shuttle{ @@ -11,5 +13,20 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + if(isCurrentFlavors("shuttle")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + } + } + if(isPassenger()){ + if(isCurrentFlavors("shuttle")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } + } } } \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index c22cc7fc81..722532c4df 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -11,5 +11,10 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + + if(isCurrentFlavors("sweeper")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-sweeper')) + } } } \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index e28d43a682..2359d31cf8 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -22,11 +22,15 @@ project.android.productFlavors { if(isDriver()){ if(isCurrentFlavors("taxi")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",true) } } if(isPassenger()){ if(isCurrentFlavors("taxi")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",false) } } } diff --git a/app/script/vehicleFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle deleted file mode 100644 index 89c0ac0559..0000000000 --- a/app/script/vehicleFlavors/fOchBusPassenger.gradle +++ /dev/null @@ -1,31 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车-乘客端 - fOchBusPassenger { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应 - matchingFallbacks = ['jinlvvan'] - - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JL", - ACTIVITY_ROOT:true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //Bus不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle deleted file mode 100644 index 39e37ccbd0..0000000000 --- a/app/script/vehicleFlavors/fOchShuttle.gradle +++ /dev/null @@ -1,31 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 - fOchShuttle { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应 - matchingFallbacks = ['shuttle'] - - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JL", - ACTIVITY_ROOT: true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //Bus不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle deleted file mode 100644 index db2eba2f1e..0000000000 --- a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车-乘客端 - fOchShuttlePassenger { - - dimension "vehicle" - matchingFallbacks = ['jinlvvan'] - - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL: "JL", - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //Bus不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index 45cf58cca2..c752255eda 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -2,7 +2,7 @@ apply from: "./script/utils.gradle" project.android.productFlavors { - // 衡阳-联想Pad-网约车-出租车 + // 东风红旗 ochDFHQ { dimension "vehicle" @@ -24,15 +24,6 @@ project.android.productFlavors { //Taxi不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - - if(isDriver()){ - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",true) - } - if(isPassenger()){ - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",false) - } } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/ochFT.gradle similarity index 94% rename from app/script/vehicleFlavors/fOchSweeper.gradle rename to app/script/vehicleFlavors/ochFT.gradle index 3c377ae261..f8c3c58d31 100644 --- a/app/script/vehicleFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 - fOchSweeper { + // 福田车 + ochFT { dimension "vehicle" // 配置AndroidManifest.xml中用到的参数 diff --git a/app/script/vehicleFlavors/fOchBus.gradle b/app/script/vehicleFlavors/ochJL.gradle similarity index 90% rename from app/script/vehicleFlavors/fOchBus.gradle rename to app/script/vehicleFlavors/ochJL.gradle index e8886f42eb..0ff0a92db6 100644 --- a/app/script/vehicleFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 - fOchBus { + ochJL { dimension "vehicle" matchingFallbacks = ['jinlvvan'] @@ -22,9 +22,6 @@ project.android.productFlavors { // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - //Bus不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' } diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index b443d65735..12001068e8 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -1,7 +1,7 @@ apply from: "./script/utils.gradle" project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 + // 金旅M1车 ochM1 { dimension "vehicle" diff --git a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle b/app/script/vehicleFlavors/ochM2.gradle similarity index 91% rename from app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle rename to app/script/vehicleFlavors/ochM2.gradle index 840e3b2050..0039042cc2 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 - fOchShuttlePassengerM2 { + ochM2 { dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 matchingFallbacks = ['m2'] @@ -8,8 +8,8 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "M2", - ACTIVITY_ROOT:true, + CHANNEL_VALUE_TAIL: "M2", + ACTIVITY_ROOT : true, SCREEN_ORIENTATION: "portrait" ] From 2df00c16ad5753ef46832fcd852fb5ed0a5113ac Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 18 Apr 2023 14:14:21 +0800 Subject: [PATCH 07/15] =?UTF-8?q?[gradle]=20[=E5=A4=9A=E5=B1=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-shuttle-passenger/build.gradle | 5 -- app/build.gradle | 4 +- app/script/flavorfilter/flavors.json | 13 ++-- app/script/functions/och.gradle | 78 +++++-------------- app/script/productFlavors/bus.gradle | 20 ++--- app/script/productFlavors/charter.gradle | 12 +-- app/script/productFlavors/shuttle.gradle | 24 +++--- app/script/productFlavors/taxi.gradle | 23 +++--- app/script/roleFlavors/driverpassenger.gradle | 36 +++++++++ app/script/roleFlavors/passenger.gradle | 3 +- app/script/utils.gradle | 16 ++++ .../vehicleFlavors/fMultiDisplayOchBus.gradle | 30 ------- .../fMultiDisplayOchTaxi.gradle | 32 -------- .../fMultiDisplaySweeper.gradle | 29 ------- config.gradle | 2 - 15 files changed, 113 insertions(+), 214 deletions(-) create mode 100644 app/script/roleFlavors/driverpassenger.gradle delete mode 100644 app/script/vehicleFlavors/fMultiDisplayOchBus.gradle delete mode 100644 app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle delete mode 100644 app/script/vehicleFlavors/fMultiDisplaySweeper.gradle diff --git a/OCH/mogo-och-shuttle-passenger/build.gradle b/OCH/mogo-och-shuttle-passenger/build.gradle index 720eb01ca9..3bdddf460d 100644 --- a/OCH/mogo-och-shuttle-passenger/build.gradle +++ b/OCH/mogo-och-shuttle-passenger/build.gradle @@ -52,11 +52,6 @@ android { dimension "vehicle" buildConfigField 'int', 'NEW_TEST', '0' } - // 车型：金旅m1 小巴业务 - m1 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } // 车型：金旅m1 小巴业务 m2 { diff --git a/app/build.gradle b/app/build.gradle index e2bebb3a97..881db2900c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -266,6 +266,7 @@ android { } apply from: "./script/roleFlavors/driver.gradle" apply from: "./script/roleFlavors/passenger.gradle" + apply from: "./script/roleFlavors/driverpassenger.gradle" apply from: "./script/productFlavors/bus.gradle" apply from: "./script/productFlavors/charter.gradle" @@ -280,11 +281,8 @@ android { apply from: "./script/vehicleFlavors/ochM2.gradle" apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/ochFT.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 apply from: "./script/vehicleFlavors/ochM1.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 341227aa67..6ee8b46ae4 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -11,11 +11,13 @@ "passenger": ["ochJL","ochM2"] }, "taxi" :{ - "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], + "driver": ["ochDFHQ"], + "driverpassenger": ["ochDFHQ"], "passenger": ["ochDFHQ"] }, "bus" :{ - "driver": ["ochJL","fMultiDisplayOchBus"], + "driver": ["ochJL"], + "driverpassenger": ["ochJL"], "passenger": ["ochJL"] }, "charter" :{ @@ -27,12 +29,13 @@ "noop" : null, "sweeper" :null, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :{ - "driver": ["ochJL","fMultiDisplayOchBus"], + "driver": ["ochJL"], + "driverpassenger": ["ochJL"], "passenger": ["ochJL"] }, "charter" :{ @@ -46,7 +49,7 @@ "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :null, diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 2dac97319d..29d99eae0f 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -2,72 +2,32 @@ project.dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) - // sweeper清扫车 - fOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) // Bus司机端 - fOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - // Bus乘客端 - fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) - fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) - ochM2Implementation(rootProject.ext.dependencies.mogoochbus) +// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) +// // Bus乘客端 +// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) +// +// // taxi司机端 +// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) +// // taxi乘客端 +// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi司机端 - fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi乘客端 - fOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) - - // Bus司机端 - fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - // Bus乘客端 - fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - - //接驳车司乘端 - ochJLImplementation(rootProject.ext.dependencies.mogoochbus) - ochJLImplementation(rootProject.ext.dependencies.mogoochbus) - - // taxi司机端 - fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi乘客端 - fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) } else { fPadLenovoImplementation (project(':OCH:mogo-och-noop')) - // sweeper 清扫车 -// fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) - - // Bus司机端 - //fOchBusImplementation (project(':OCH:mogo-och-bus')) - // Bus乘客端 - //fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) - - - // 包车 -// ochDriverM1Implementation (project(':OCH:mogo-och-charter')) -// ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) - - // taxi司机端 -// fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) - // taxi乘客端 -// fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // 多屏幕-Bus司机端 - fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) - // 多屏幕-Bus乘客端 - fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) - - // 多屏幕-taxi司机端 - //接驳车司乘端 -// ochJLImplementation (project(':OCH:mogo-och-shuttle')) -// ochJLImplementation (project(':OCH:mogo-och-shuttle-passenger')) -// ochM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) - - // taxi司机端 - fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) - // 多屏幕-taxi乘客端 - fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) - - // 清扫车-多屏幕 - fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) +// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) +// // 多屏幕-Bus乘客端 +// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) +// +// // taxi司机端 +// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) +// // 多屏幕-taxi乘客端 +// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) +// +// // 清扫车-多屏幕 +// fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) } } diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 8aca69e63c..460df992a1 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -13,19 +13,15 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ - if(isCurrentFlavors("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } + if(isCurrentDriver("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } - if(isPassenger()){ - if(isCurrentFlavors("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } + if(isCurrentPassenger("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 8bbfe7d575..3eb2eeddfb 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -14,23 +14,19 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ + if(isCurrentDriver("charter")){ // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - if(isCurrentFlavors("charter")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) - } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) } - if(isPassenger()){ + if(isCurrentPassenger("charter")){ // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - if(isCurrentFlavors("charter")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) - } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) } } } \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 36599728c1..f901388097 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -2,11 +2,11 @@ apply from: "./script/utils.gradle" project.android.productFlavors { // 接驳车业务 - shuttle{ + shuttle { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Shuttle", + CHANNEL_VALUE_HEAD: "Shuttle", ] buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" @@ -14,19 +14,15 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ - if(isCurrentFlavors("shuttle")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } + if (isCurrentDriver("shuttle")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } - if(isPassenger()){ - if(isCurrentFlavors("shuttle")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } + if (isCurrentPassenger("shuttle")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 2359d31cf8..4133644d33 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Taxi", + CHANNEL_VALUE_HEAD: "Taxi", ] buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" @@ -18,20 +18,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - if(isDriver()){ - if(isCurrentFlavors("taxi")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",true) - } + if (isCurrentDriver("taxi")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT", true) } - if(isPassenger()){ - if(isCurrentFlavors("taxi")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",false) - } + if (isCurrentPassenger("taxi")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT", false) } } } \ No newline at end of file diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle new file mode 100644 index 0000000000..93f70b51f4 --- /dev/null +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -0,0 +1,36 @@ +project.android.productFlavors { + driverpassenger { + dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Driver", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + } +} \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index d44c0c5c28..79cc5f23f8 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -1,5 +1,4 @@ project.android.productFlavors { - // 包车业务 passenger { dimension "role" externalNativeBuild { @@ -19,6 +18,8 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 0f337cc3ff..2e632e3134 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -1,3 +1,17 @@ +boolean isCurrentDriver(String flavors) { + if(isDriver() && isCurrentFlavors(flavors)){ + return true + } + return false +} + +boolean isCurrentPassenger(String flavors) { + if(isPassenger() && isCurrentFlavors(flavors)){ + return true + } + return false +} + boolean isDriver() { for (String s : gradle.startParameter.taskNames) { if (s.contains("Driver") | s.contains("driver")) { @@ -31,5 +45,7 @@ ext { isPassenger = this.&isPassenger isDriver = this.&isDriver isCurrentFlavors = this.&isCurrentFlavors + isCurrentDriver = this.&isCurrentDriver + isCurrentPassenger = this.&isCurrentPassenger } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle deleted file mode 100644 index f8a5c5c064..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle +++ /dev/null @@ -1,30 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplayOchBus { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的m1对应 - matchingFallbacks = ['jinlvvan'] - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JLKV", - ACTIVITY_ROOT : true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JLKV\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle deleted file mode 100644 index 70724d6074..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplayOchTaxi { - dimension "vehicle" - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // BUGLY_APP_CHANNEL - CHANNEL_VALUE_TAIL : "DFHQ", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle deleted file mode 100644 index 1cdc26af8e..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle +++ /dev/null @@ -1,29 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplaySweeper { - dimension "vehicle" - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // BUGLY_APP_CHANNEL - CHANNEL_VALUE_TAIL : "FT", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/config.gradle b/config.gradle index c2c71ebf9c..3bc6477fa7 100644 --- a/config.gradle +++ b/config.gradle @@ -228,8 +228,6 @@ ext { buildToolsVersion : "29.0.2", minSdkVersion : 23, targetSdkVersion : 27, - minSdkVersionPadLenovo : 23, - targetSdkVersionPadLenovo : 27, koomxhook : "com.kuaishou.koom:xhook-static:2.2.0", ] } From 64e0cc8ed4c6cabfec4c385d92285ced5e5043f6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 19 Apr 2023 11:27:05 +0800 Subject: [PATCH 08/15] =?UTF-8?q?[=E5=85=AC=E4=BA=A4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=88=A0=E9=99=A4=E5=8F=8C=E5=B1=8F?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index c931b96c5b..d90ec06928 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -45,10 +45,6 @@ public class MogoOCHBusPassenger implements IMogoOCH { this.mActivity = activity; this.mContainerId = containerId; showFragment(); - - if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { - MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class); - } return null; } From 668f8ec84fdd585ab812ba71d6c8b97b15f4cf6a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 19 Apr 2023 15:39:21 +0800 Subject: [PATCH 09/15] =?UTF-8?q?[gradle]=20[gradle=20=E6=95=B4=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/productFlavors/bus.gradle | 18 ++++++++----- app/script/productFlavors/charter.gradle | 19 ++++++------- app/script/productFlavors/noop.gradle | 20 ++++++++++++-- app/script/productFlavors/shuttle.gradle | 27 +++++++++++++++---- app/script/productFlavors/sweeper.gradle | 14 ++++++++-- app/script/productFlavors/taxi.gradle | 10 +++---- app/script/roleFlavors/driver.gradle | 15 ++++++----- app/script/roleFlavors/driverpassenger.gradle | 21 ++++++++------- app/script/roleFlavors/passenger.gradle | 13 ++++----- app/script/utils.gradle | 21 ++++++++++++++- app/script/vehicleFlavors/fPadLenovo.gradle | 15 +++-------- app/script/vehicleFlavors/ochDFHQ.gradle | 14 +++++----- app/script/vehicleFlavors/ochFT.gradle | 14 +++------- app/script/vehicleFlavors/ochJL.gradle | 10 +++---- app/script/vehicleFlavors/ochM1.gradle | 11 +++----- app/script/vehicleFlavors/ochM2.gradle | 14 +++------- 16 files changed, 149 insertions(+), 107 deletions(-) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 460df992a1..16b8f6060f 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -5,23 +5,29 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Bus", + // 标识 + CHANNEL_VALUE_HEAD: "Bus", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + if(isCurrentDriver("bus")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } if(isCurrentPassenger("bus")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 3eb2eeddfb..6d4c97faf4 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -6,25 +6,26 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Charter", + CHANNEL_VALUE_HEAD: "Charter", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] - + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + if(isCurrentDriver("charter")){ - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 + // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) } if(isCurrentPassenger("charter")){ - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 + // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) } diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index d783019507..600ddfbaf5 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -4,11 +4,27 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Noop", + // 标识 + CHANNEL_VALUE_HEAD: "Noop", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" - // 连接的工控机IP地址 + + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" + + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + if(isCurrentDriver("noop")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-noop')) + } + } } \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index f901388097..8f39287f35 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -6,23 +6,40 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ + // 标识 CHANNEL_VALUE_HEAD: "Shuttle", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" if (isCurrentDriver("shuttle")) { - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) - // 构建 是否支持多屏异显异交互 + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) } if (isCurrentPassenger("shuttle")) { + if(isM2()){ + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + } + if(isJL()){ + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } \ No newline at end of file diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index 722532c4df..a7f182ee1a 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -4,14 +4,24 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Sweeper", + // 标识 + CHANNEL_VALUE_HEAD: "Sweeper", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, ] + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + // ③是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + if(isCurrentFlavors("sweeper")){ project.dependencies.add('implementation', project.project(':OCH:mogo-och-sweeper')) diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 4133644d33..f30c176a79 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -6,17 +6,17 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Taxi", ] - + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" - // 连接的工控机IP地址 + // ②连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 + // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + // ④构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' if (isCurrentDriver("taxi")) { project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle index 575ed25af7..255863cba2 100644 --- a/app/script/roleFlavors/driver.gradle +++ b/app/script/roleFlavors/driver.gradle @@ -19,16 +19,19 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" - // 是否需要实时上报坐标 + + // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + + // ③是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + + // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的是否是演示（美化）模式 + // ⑤构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle index 93f70b51f4..16d3557134 100644 --- a/app/script/roleFlavors/driverpassenger.gradle +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -19,18 +19,19 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - // 构建的是否是演示（美化）模式 + // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + + // ③是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + + // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // ⑤构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index 79cc5f23f8..b2ca2baf59 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -19,16 +19,17 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" - // 是否需要实时上报坐标 + // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + + // ③是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的是否是演示（美化）模式 + // ⑤构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 2e632e3134..9db724526c 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -30,6 +30,24 @@ boolean isPassenger() { return false } +boolean isJL() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("OchJL") | s.contains("ochJL")) { + return true + } + } + return false +} + +boolean isM2() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("OchM2") | s.contains("ochM2")) { + return true + } + } + return false +} + boolean isCurrentFlavors(String flavors){ for (String s : gradle.startParameter.taskNames) { @@ -47,5 +65,6 @@ ext { isCurrentFlavors = this.&isCurrentFlavors isCurrentDriver = this.&isCurrentDriver isCurrentPassenger = this.&isCurrentPassenger - + isJL = this.&isJL + isM2 = this.&isM2 } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 3a1ad7c8ed..9b41beb285 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -7,27 +7,18 @@ project.android.productFlavors { // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fPadLenovo", CHANNEL_VALUE_TAIL: "Noop", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"Noop\"" - - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index c752255eda..d777b309d0 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -1,11 +1,9 @@ -apply from: "./script/utils.gradle" - project.android.productFlavors { - // 东风红旗 ochDFHQ { dimension "vehicle" + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL @@ -14,14 +12,14 @@ project.android.productFlavors { SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" + // ②构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //Taxi不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' } diff --git a/app/script/vehicleFlavors/ochFT.gradle b/app/script/vehicleFlavors/ochFT.gradle index f8c3c58d31..0888e6aad1 100644 --- a/app/script/vehicleFlavors/ochFT.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -3,28 +3,22 @@ project.android.productFlavors { ochFT { dimension "vehicle" + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "FT", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //清扫车不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/ochJL.gradle index 0ff0a92db6..974a87a1ab 100644 --- a/app/script/vehicleFlavors/ochJL.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -8,21 +8,17 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL : "JL", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - //Bus不能启动自驾的档位 + // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' } } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 12001068e8..07c6827093 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -8,21 +8,18 @@ project.android.productFlavors { // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "Charter_Driver_M1", CHANNEL_VALUE_TAIL: "M1", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M1\"" - //M1不能启动自驾的档位 + // ②构建的是否要动态更换模型 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + // ③不能启动自驾的档位 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' if(isDriver()){ matchingFallbacks = ['driverm1'] diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index 0039042cc2..05dcd0c5c4 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -9,24 +9,16 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2", - ACTIVITY_ROOT : true, SCREEN_ORIENTATION: "portrait" ] - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M2\"" - - // 构建的是否要动态更换模型 + // ②构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //M2不能启动自驾的档位 + // ③M2不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' } } \ No newline at end of file From 6a6c8b61a8d7c21fc3520950dc786900e6b0c9fb Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 19 Apr 2023 16:13:56 +0800 Subject: [PATCH 10/15] =?UTF-8?q?[gradle]=20[=E5=B9=BF=E5=91=8A=E9=85=8D?= =?UTF-8?q?=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/tempConfig.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index 5fb927ab6d..b4482bbd28 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -1,6 +1,6 @@ { "mogo": { - "shuttlepassenger": { + "shuttlepassengerochjl": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", @@ -64,7 +64,7 @@ } ] }, - "shuttlepassengerm2": { + "shuttlepassengerochm2": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", @@ -82,7 +82,7 @@ } }, "dali": { - "shuttlepassenger": { + "shuttlepassengerochjl": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", @@ -146,7 +146,7 @@ } ] }, - "shuttlepassengerm2": { + "shuttlepassengerochm2": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", @@ -164,7 +164,7 @@ } }, "yantai": { - "shuttlepassenger": { + "shuttlepassengerochjl": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", @@ -180,7 +180,7 @@ } ] }, - "shuttlepassengerm2": { + "shuttlepassengerochm2": { "ads": [ { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", From 406868604838020754cc26bfc3f9db4bcb52a53a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Apr 2023 15:04:12 +0800 Subject: [PATCH 11/15] =?UTF-8?q?[2.15=E3=80=820]=20[=E5=A4=A7=E7=90=86?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=85=AC=E4=BA=A4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/flavorfilter/flavors.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 6ee8b46ae4..7cd2d89a04 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -34,9 +34,9 @@ }, "taxi" :null, "bus" :{ - "driver": ["ochJL"], - "driverpassenger": ["ochJL"], - "passenger": ["ochJL"] + "driver": null, + "driverpassenger": null, + "passenger": null }, "charter" :{ "driver": ["ochM1"], From bb87768dcca3b25544c9fd206fe698f447830bcf Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Apr 2023 16:31:45 +0800 Subject: [PATCH 12/15] =?UTF-8?q?[gradle]=20[=E6=A8=AA=E7=AB=96=E5=B1=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/productFlavors/bus.gradle | 2 ++ app/script/productFlavors/charter.gradle | 2 ++ app/script/productFlavors/noop.gradle | 2 ++ app/script/productFlavors/shuttle.gradle | 3 +++ app/script/productFlavors/sweeper.gradle | 2 ++ app/script/productFlavors/taxi.gradle | 2 ++ app/script/vehicleFlavors/fPadLenovo.gradle | 2 -- app/script/vehicleFlavors/ochDFHQ.gradle | 2 -- app/script/vehicleFlavors/ochFT.gradle | 2 -- app/script/vehicleFlavors/ochJL.gradle | 2 -- app/script/vehicleFlavors/ochM1.gradle | 2 -- app/script/vehicleFlavors/ochM2.gradle | 1 - 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 16b8f6060f..295d5a7295 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -9,6 +9,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Bus", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 6d4c97faf4..5c4d34e613 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -9,6 +9,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Charter", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 600ddfbaf5..12de255384 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -8,6 +8,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Noop", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 8f39287f35..2544d9c22c 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -24,6 +24,7 @@ project.android.productFlavors { // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") } if (isCurrentPassenger("shuttle")) { if(isM2()){ @@ -31,12 +32,14 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + manifestPlaceholders.put("SCREEN_ORIENTATION", "portrait") } if(isJL()){ // ③是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' // ④构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape") } project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index a7f182ee1a..48a93a6e1e 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -8,6 +8,8 @@ project.android.productFlavors { CHANNEL_VALUE_HEAD: "Sweeper", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index f30c176a79..963222eb2c 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -5,6 +5,8 @@ project.android.productFlavors { manifestPlaceholders = [ CHANNEL_VALUE_HEAD: "Taxi", + // Activity的朝向 + SCREEN_ORIENTATION:"landscape", ] // ①标识 buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 9b41beb285..2491d98530 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "Noop", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index d777b309d0..1a65b6f110 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "DFHQ", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] diff --git a/app/script/vehicleFlavors/ochFT.gradle b/app/script/vehicleFlavors/ochFT.gradle index 0888e6aad1..1f711ee29f 100644 --- a/app/script/vehicleFlavors/ochFT.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "FT", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/ochJL.gradle index 974a87a1ab..831bdd7ecd 100644 --- a/app/script/vehicleFlavors/ochJL.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -8,8 +8,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL : "JL", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 07c6827093..77bdc5e030 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -9,8 +9,6 @@ project.android.productFlavors { manifestPlaceholders = [ // BUGLY_APP_CHANNEL CHANNEL_VALUE_TAIL: "M1", - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index 05dcd0c5c4..2f016eb3fa 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -9,7 +9,6 @@ project.android.productFlavors { //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2", - SCREEN_ORIENTATION: "portrait" ] // ①标识构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 From bc272eb63aa6d863ba608f7dd45242ca0cb63aaa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Apr 2023 18:40:41 +0800 Subject: [PATCH 13/15] =?UTF-8?q?[gradle]=20[=E6=A8=AA=E7=AB=96=E5=B1=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/vehicleFlavors/ochDFHQ.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index 1a65b6f110..90e48b667a 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -15,7 +15,7 @@ project.android.productFlavors { buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" // ②构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // ③不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' From 5ee4f8cd0f35ed6d1ffbc133d819669b60f4f84f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Apr 2023 11:00:23 +0800 Subject: [PATCH 14/15] =?UTF-8?q?[gradle]=20[shuttle=20=E6=B7=BB=E5=8A=A0M?= =?UTF-8?q?2=E5=8F=B8=E6=9C=BA=E5=B1=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/script/flavorfilter/flavors.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 7cd2d89a04..9fd192a912 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -7,7 +7,7 @@ "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :{ @@ -26,25 +26,16 @@ } }, "dali": { - "noop" : null, - "sweeper" :null, "shuttle" :{ "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, - "taxi" :null, - "bus" :{ - "driver": null, - "driverpassenger": null, - "passenger": null - }, "charter" :{ "driver": ["ochM1"], "passenger": ["ochM1"] } }, "yantai": { - "noop" :null, "sweeper" :{ "driver": ["ochFT"] }, @@ -52,8 +43,6 @@ "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, - "taxi" :null, - "bus" :null, "charter" :{ "driver": ["ochM1"], "passenger": ["ochM1"] From 430fa345d500d998843cf1e5ca08148ced72b6ce Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Apr 2023 11:29:10 +0800 Subject: [PATCH 15/15] =?UTF-8?q?[gradle]=20[=E5=8A=A8=E6=80=81=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E8=AE=BE=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gradle.properties b/gradle.properties index afacfe1894..4552229b4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -146,3 +146,24 @@ ADAS_DATA_LIB_CHILD_VERSION=.0 # 线程优化版本 THREAD_OPT_VERSION=4.0.1 + +# 测试模式司机端版本号 +NOOP_DRIVER_VERSION=3.1.0 +# 公交模式司机端版本号 +BUS_DRIVER_VERSION=3.1.0 +# 公交模式乘客端端版本号 +BUS_PASSENGER_VERSION=2.1.0 +# 接驳模式司机端版本号 +SHUTTLE_DRIVER_VERSION=3.1.0 +# 接驳模式乘客端端版本号 +SHUTTLE_PASSENGER_VERSION=2.1.0 +# 出租车模式司机端版本号 +TAXI_DRIVER_VERSION=3.1.0 +# 出租车模式乘客端端版本号 +TAXI_PASSENGER_VERSION=2.1.0 +# 清扫车模式司机端版本号 +SWEEPER_DRIVER_VERSION=3.1.0 +# 包车模式司机端版本号 +CHARTER_DRIVER_VERSION=3.1.0 +# 包车模式乘客端端版本号 +CHARTER_PASSENGER_VERSION=2.1.0 \ No newline at end of file