fixed conflict

2023-01-29 17:33:43 +08:00
parent b60fbb2613 8433d0c8de
commit 2a9111c996
27 changed files with 546 additions and 533 deletions
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
@@ -6,11 +6,6 @@ package com.mogo.eagle.core.data.config
 * 配置 HMI 展示元素
 */
 object HmiBuildConfig {
-    /**
-     * 是否展示 速度
-     */
-    @JvmField
-    var isShowSpeedView = true

    /**
     * 是否展示 自动驾驶 按钮
@@ -24,24 +19,6 @@ object HmiBuildConfig {
    @JvmField
    var isShowPerspectiveSwitchView = true

-    /**
-     * 是否展示 工具箱 按钮
-     */
-    @JvmField
-    var isShowToolsView = true
-
-    /**
-     * 是否展示 BadCase按钮
-     */
-    @JvmField
-    var isShowBadCaseView = true
-
-    /**
-     * 是否展示 工控机升级提示UI
-     */
-    @JvmField
-    var isShowUpgradeTipsView = true
-
    /**
     * 是否展示 转向灯ui
     */