[gradle]

[添加role flavors]
2023-03-21 20:55:13 +08:00
parent 856120c3b2
commit 7c54fb20ea
24 changed files with 105 additions and 68 deletions
--- 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 {
--- a/app/script/productFlavors/bus.gradle
+++ 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\""
+    }
+}
--- a/app/script/productFlavors/charter.gradle
+++ 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\""
+    }
+}
--- a/app/script/productFlavors/noop.gradle
+++ 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\""
+    }
+}
--- a/app/script/productFlavors/shuttle.gradle
+++ 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\""
+    }
+}
--- a/app/script/productFlavors/sweeper.gradle
+++ 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\""
+    }
+}
--- a/app/script/productFlavors/taxi.gradle
+++ 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\""
+    }
+}
--- a/app/script/roleFlavors/driver.gradle
+++ b/app/script/roleFlavors/driver.gradle
@@ -0,0 +1,6 @@
+project.android.productFlavors {
+    driver {
+        dimension "role"
+        buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\""
+    }
+}
--- a/app/script/roleFlavors/passenger.gradle
+++ b/app/script/roleFlavors/passenger.gradle
@@ -0,0 +1,7 @@
+project.android.productFlavors {
+    // 包车业务
+    passenger{
+        dimension "role"
+        buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\""
+    }
+}
--- a/app/script/vehicleFlavors/README.md
+++ b/app/script/vehicleFlavors/README.md
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'

--- a/app/script/vehicleFlavors/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'

--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型
--- a/app/script/vehicleFlavors/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'
        // 构建的是否要动态更换模型