From 7c54fb20eaab5e2391ffeeda19c8fe0bd7b02d01 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 20:55:13 +0800 Subject: [PATCH] =?UTF-8?q?[gradle]=20[=E6=B7=BB=E5=8A=A0role=20flavors]?= 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' // 构建的是否要动态更换模型