From 6862225384e66301af5a1608367a319bc8589992 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 13 Jan 2023 11:16:34 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.2][gradle]=20=E5=91=BD=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/productFlavors/README.md | 10 +++++----- app/productFlavors/fMultiDisplayOchBus.gradle | 2 +- app/productFlavors/fMultiDisplayOchTaxi.gradle | 2 +- app/productFlavors/fPadLenovo.gradle | 2 +- app/productFlavors/fPadLenovoOchBus.gradle | 2 +- app/productFlavors/fPadLenovoOchBusPassenger.gradle | 2 +- app/productFlavors/fPadLenovoOchTaxi.gradle | 2 +- app/productFlavors/fPadLenovoOchTaxiPassenger.gradle | 2 +- .../mogo/eagle/core/data/config/FunctionBuildConfig.kt | 10 +++++----- .../com/mogo/eagle/core/utilcode/ExampleUnitTest.kt | 8 ++++---- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/productFlavors/README.md b/app/productFlavors/README.md index 9cc46ff0fb..66b93ae8f2 100644 --- a/app/productFlavors/README.md +++ b/app/productFlavors/README.md @@ -7,17 +7,17 @@ APP_IDENTITY_MODE规则： Driver 司机屏 Passenger 乘客屏 车型 - Basc basc(东风、红旗、金旅) + Base base(东风、红旗、金旅) M1 m1 M2 m2 Van 开沃 FT 福田 已有： - taxi司机屏 Taxi_Driver_Basc （东风、红旗司机端） - taxi乘客屏 Taxi_Passenger_Basc （东风、红旗乘客端） - bus司机屏 Bus_Driver_Basc （金旅小巴司机端） + taxi司机屏 Taxi_Driver_Base （东风、红旗司机端） + taxi乘客屏 Taxi_Passenger_Base （东风、红旗乘客端） + bus司机屏 Bus_Driver_Base （金旅小巴司机端） Bus_Driver_Van （开沃小巴司机端） - bus乘客屏 Bus_Passenger_Basc （金旅、开沃小巴乘客端） + bus乘客屏 Bus_Passenger_Base （金旅、开沃小巴乘客端） Bus_Passenger_M1 （M1小巴乘客端） Bus_Passenger_M2 （M2小巴乘客端） 清扫车 Sweeper_Driver_FT （福田清扫车司机端） \ No newline at end of file diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/productFlavors/fMultiDisplayOchBus.gradle index 57c054b6c9..8b3608c211 100644 --- a/app/productFlavors/fMultiDisplayOchBus.gradle +++ b/app/productFlavors/fMultiDisplayOchBus.gradle @@ -26,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/productFlavors/fMultiDisplayOchTaxi.gradle index 451486c06c..a5534d3fce 100644 --- a/app/productFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/productFlavors/fMultiDisplayOchTaxi.gradle @@ -26,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 5e6425d809..3f81f59165 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -24,7 +24,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index 8b303c8216..faade038b5 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -26,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 3f1f50a229..7d3a4fb24b 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -24,7 +24,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index 9c2cb74f62..8b03a2ae79 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -27,7 +27,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index ab1c8a68e6..0ea289b89d 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -26,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_Basc\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_Base\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\"" // 构建的是否是演示（美化）模式 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 1fffc67a2a..308270a491 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 @@ -67,17 +67,17 @@ object FunctionBuildConfig { /** * 当前APP的身份模式 * - * Taxi_Driver_Basc = 出租车-司机模式（默认） - * Taxi_Passenger_Basc = 出租车-乘客模式（部分功能受到限制） + * Taxi_Driver_Base = 出租车-司机模式（默认） + * Taxi_Passenger_Base = 出租车-乘客模式（部分功能受到限制） * - * Bus_Driver_Basc = 小巴车-司机模式（默认） - * Bus_Passenger_Basc = 小巴车-乘客模式（部分功能受到限制） + * Bus_Driver_Base = 小巴车-司机模式（默认） + * Bus_Passenger_Base = 小巴车-乘客模式（部分功能受到限制） * * Sweeper_Driver_FT = 清扫车-司机模式（默认） */ @Volatile @JvmField - var appIdentityMode = "Taxi_Driver_Basc" + var appIdentityMode = "Taxi_Driver_Base" /** * 配置连接工控机的IP地址 diff --git a/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt b/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt index aa7710ddc3..da8eadb279 100644 --- a/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt +++ b/core/mogo-core-utils/src/test/java/com/mogo/eagle/core/utilcode/ExampleUnitTest.kt @@ -18,10 +18,10 @@ class ExampleUnitTest { println("start") - val mode1 = "Taxi_Driver_Basc" - val mode2 = "Taxi_Passenger_Basc" - val mode3 = "Bus_Driver_Basc" - val mode4 = "Bus_Passenger_Basc" + val mode1 = "Taxi_Driver_Base" + val mode2 = "Taxi_Passenger_Base" + val mode3 = "Bus_Driver_Base" + val mode4 = "Bus_Passenger_Base" val mode5 = "Bus_Passenger_M1" val mode6 = "Bus_Passenger_M2" val mode7 = "Bus_Passenger_Van"