From 76d9f1c14155003c0da4ce690f869e6e770e7340 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 11 Jul 2022 17:01:29 +0800 Subject: [PATCH] =?UTF-8?q?cherry-pick=20=E5=B0=8F=E9=B9=8F=2065320311d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/MoGoHmiFragment.kt | 50 +++++++++++++++++-- .../com/mogo/map/MogoMapUIController.java | 2 +- .../map/uicontroller/AMapUIController.java | 2 +- 3 files changed, 47 insertions(+), 7 deletions(-) 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 7f7d478472..a458f83a4f 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 @@ -49,6 +49,7 @@ import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.check.CallerCheckManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.WaringConst @@ -85,7 +86,6 @@ import kotlinx.coroutines.* import mogo_msg.MogoReportMsg import record_cache.RecordPanelOuterClass import java.util.* -import kotlin.collections.ArrayList /** @@ -990,28 +990,68 @@ import kotlin.collections.ArrayList } } + private var isLeftLight :Boolean = false + private var isRightLight :Boolean = false + private var isDisappare :Boolean = false + /** * 显示转向灯效果 if (HmiBuildConfig.isShowBadCaseView) { */ override fun showTurnLight(light: Int) { if (HmiBuildConfig.isShowTurnLightView) { ThreadUtils.runOnUiThread { - turnLightView?.let { - turnLightView.setTurnLight(light) + if (light == 1) { + if (!isLeftLight) { + isLeftLight = true + isRightLight = false + isDisappare = false + //TODO + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500) + } + } else if (light == 2) { + if (!isRightLight) { + isRightLight = true + isLeftLight = false + isDisappare = false + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(2, 500) + } + } else { + if (!isDisappare) { + isDisappare = true + isLeftLight = false + isRightLight = false + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) + } } + +// turnLightView?.let { +// turnLightView.setTurnLight(light) +// } } } } + private var isBrake: Boolean = false + /** * 显示刹车效果 */ override fun showBrakeLight(light: Int) { if (HmiBuildConfig.isShowBrakeLightView) { ThreadUtils.runOnUiThread { - brakeView?.let { - brakeView.setBrakeLight(light) + if (light == 1) { //刹车灯亮 + if (!isBrake) { + isBrake = true + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500) + } + } else { + isBrake = false + CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500) } + +// brakeView?.let { +// brakeView.setBrakeLight(light) +// } } } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index f25d1a1d89..905938de63 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -257,7 +257,7 @@ public class MogoMapUIController implements IMogoMapUIController { public void setCarLightsType(int type, int time) { initDelegate(); if (mDelegate != null) { -// Log.d("liyz", "MogoMapUIController type = " + type + "---time = " + time); + Log.d("liyz", "MogoMapUIController type = " + type + "---time = " + time); mDelegate.setCarLightsType(type, time); } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java index ccc7018538..e772d84e7b 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java @@ -223,7 +223,7 @@ public class AMapUIController implements IMogoMapUIController { @Override public void setCarLightsType(int type, int time) { -// Log.d("liyz", "AMapUIController type = " + type + "---time = " + time); + Log.d("liyz", "AMapUIController type = " + type + "---time = " + time); if (mClient != null) { mClient.setCarLightsType(type, time); }