From 25833331749006bd1fedf4da602cbdb542fea026 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 13 Jun 2022 19:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、美化模式去掉SP缓存，只需要本地内存保存即可 2、美化模式默认设为关闭 --- app/productFlavors/f8xx.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 +- app/productFlavors/fochbus.gradle | 2 +- app/productFlavors/fochtaxi.gradle | 2 +- app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt | 3 --- .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 1 - .../com/mogo/eagle/core/data/config/FunctionBuildConfig.kt | 2 +- .../main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt | 3 --- 12 files changed, 9 insertions(+), 16 deletions(-) diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle index 9504d6c0c6..bb0a3be919 100644 --- a/app/productFlavors/f8xx.gradle +++ b/app/productFlavors/f8xx.gradle @@ -31,7 +31,7 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 830d322313..d24cd0e616 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -31,6 +31,6 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index 481187896d..fee00431e4 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -33,6 +33,6 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 74487113d3..241ba1770b 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -31,6 +31,6 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index 7a583209e6..5111983e45 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -34,7 +34,7 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index 2c4ad036b9..4a4e2ac167 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -33,7 +33,7 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle index 16feafdae4..e86161847a 100644 --- a/app/productFlavors/fochbus.gradle +++ b/app/productFlavors/fochbus.gradle @@ -31,7 +31,7 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle index fa21f03205..47bcbd5ede 100644 --- a/app/productFlavors/fochtaxi.gradle +++ b/app/productFlavors/fochtaxi.gradle @@ -31,7 +31,7 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt index 442700a153..1647869ae4 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt @@ -99,8 +99,5 @@ class ConfigStartUp : AndroidStartup() { FunctionBuildConfig.skinMode = 1 } - // 是否是演示（美化）模式，会存在SP中，方便做现场恢复 - FunctionBuildConfig.isDemoMode = - SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 38ea3d75ff..6807ab3408 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -539,7 +539,6 @@ class DebugSettingView @JvmOverloads constructor( if (!FunctionBuildConfig.isDemoMode) { tbIsDrawAutopilotTrajectoryData.isChecked = false } - SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked) } 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 3c7cd675c6..d295029d62 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 @@ -8,7 +8,7 @@ package com.mogo.eagle.core.data.config object FunctionBuildConfig { /** - * 是否是演示（美化）模式，会存在SP中，方便做现场恢复 + * 是否是演示（美化）模式 * 1.当点击【开始服务（taxi）/滑动出发（bus）】btn后，不管实际自动驾驶按钮「state值」如何变更，自动驾驶按钮都呈现2的状态。 * 只是自动驾驶按钮的样式为2-被选中的状态 * 若点击，则可继续向自动驾驶系统发送启动自动驾驶的命令。 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt index 815eb08e8e..9ab0e0bd07 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt @@ -17,9 +17,6 @@ object MoGoConfig { // CMD全量日志抓取当时时间 const val CATCH_LOG_TIME = "CATCH_LOG_TIME" - // 是否是演示（美化）模式，会存在SP中，方便做现场恢复 - const val IS_DEMO_MODE = "IS_DEMO_MODE" - //根据加速度判断是否刹车阈值 const val BRAKE_ACCELERATION_THRESHOLD = "BRAKE_ACCELERATION_THRESHOLD"