From 0e1041db592f46fe4c8892475c2e20e56dbd3fcf Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 3 Jan 2023 20:01:00 +0800 Subject: [PATCH] =?UTF-8?q?[1.1.0]=20[Change]=20[1=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B8=85=E6=89=AB=E8=BD=A6=E5=88=A4=E6=96=AD=E6=96=B9?= =?UTF-8?q?=E6=B3=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/productFlavors/fPadLenovoOchSweeper.gradle | 4 ++-- .../eagle/core/data/config/FunctionBuildConfig.kt | 2 ++ .../eagle/core/utilcode/mogo/AppIdentityModeUtils.kt | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/productFlavors/fPadLenovoOchSweeper.gradle b/app/productFlavors/fPadLenovoOchSweeper.gradle index 97db194a24..35a55f8b87 100644 --- a/app/productFlavors/fPadLenovoOchSweeper.gradle +++ b/app/productFlavors/fPadLenovoOchSweeper.gradle @@ -28,8 +28,8 @@ project.android.productFlavors { // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" - // 构建的应用身份类型，出租车0|小巴A-司机｜乘客 - buildConfigField 'int', 'APP_IDENTITY_MODE', "0xA0" + // 构建的应用身份类型，出租车0|小巴A｜清扫车B-司机｜乘客 + buildConfigField 'int', 'APP_IDENTITY_MODE', "0xB0" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 690adf88a0..029def31b3 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -72,6 +72,8 @@ object FunctionBuildConfig { * * 0xA0 = 小巴车-司机模式（默认） * 0xA1 = 小巴车-乘客模式（部分功能受到限制） + * + * 0xB0 = 清扫车-司机模式（默认） */ @Volatile @JvmField diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt index 0973bfc39f..b775f51e71 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt @@ -50,6 +50,17 @@ object AppIdentityModeUtils { return appIdentityMode and 0xA0 == 0xA0 } + /** + * 是否是 清扫车（这里不细分具体是：司机、乘客等类型） + * + * @param appIdentityMode productFlavors 配置的类型 + * @return true - 是清扫车端 false - 不是清扫车端 + */ + @JvmStatic + fun isSweeper(appIdentityMode: Int): Boolean { + return appIdentityMode and 0xB0 == 0xB0 + } + /** * 是否是 出租车端（这里不细分具体是：司机、乘客等类型） *