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