From 617a4cc9a14fe94e1d08002d4606693dc910bdb6 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 21 Feb 2022 17:38:44 +0800 Subject: [PATCH] add light switch --- .../java/com/mogo/launcher/MogoApplication.java | 3 +++ .../eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 15 ++++++++------- .../function/hmi/ui/setting/DebugSettingView.kt | 8 ++++++++ .../src/main/res/layout/view_debug_setting.xml | 9 +++++++++ .../mogo/eagle/core/data/config/HmiBuildConfig.kt | 12 ++++++++++++ .../api/hmi/warning/IMoGoWaringProvider.kt | 7 ++++++- .../core/function/call/hmi/CallerHmiManager.kt | 9 ++++++++- 7 files changed, 54 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index c7b012b41a..5cca4632bb 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -88,6 +88,9 @@ public class MogoApplication extends MainMoGoApplication { HmiBuildConfig.isShowPerspectiveSwitchView = false; HmiBuildConfig.isShowToolsView = false; HmiBuildConfig.isShowBadCaseView = false; + //业务端可以根据需要控制是否展示刹车和转向灯的ui +// HmiBuildConfig.isShowBrakeLightView = false; +// HmiBuildConfig.isShowTurnLightView = false; } if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxi") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index c26a078c9f..8620a150ef 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -1024,13 +1024,11 @@ class MoGoHmiFragment : MvpFragment } } - private var isOpenTurnlight :Boolean = true - /** - * 显示转向灯效果 + * 显示转向灯效果 if (HmiBuildConfig.isShowBadCaseView) { */ override fun showTurnLight(light: Int) { - if (isOpenTurnlight) { + if (HmiBuildConfig.isShowTurnLightView) { //Log.d("liyz", "showTurnLight light = $light") turnLightView.setTurnLight(light) } @@ -1040,15 +1038,18 @@ class MoGoHmiFragment : MvpFragment * 显示刹车效果 */ override fun showBrakeLight(light: Int) { - if (isOpenTurnlight) { + if (HmiBuildConfig.isShowBrakeLightView) { // Log.d("liyz", "showBrakeLight light = $light") brakeView.setBrakeLight(light) } } - override fun setTurnLightFunction(isOpen: Boolean) { - isOpenTurnlight = isOpen + HmiBuildConfig.isShowTurnLightView = isOpen + } + + override fun setBrakeLightFunction(isOpen: Boolean) { + HmiBuildConfig.isShowBrakeLightView = isOpen } /** 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 2c15603588..5b97241065 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 @@ -196,6 +196,14 @@ class DebugSettingView @JvmOverloads constructor( } } + tbOpenBrakeLight.setOnCheckedChangeListener { buttonView, isChecked -> + if (!isChecked) { + CallerHmiManager.setBrakeLightFunction(true) + } else { + CallerHmiManager.setBrakeLightFunction(false) + } + } + changesight_top_btn.setOnClickListener { CallerHDMapManager.setMapDAngle(0); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index fae006ce57..6fcc804aac 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -171,6 +171,15 @@ android:textOn="打开「转向灯控制」" android:textSize="@dimen/dp_24" /> +