From aafb30ef701ab5b83e301f46783543d6dbaddeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 27 Sep 2021 12:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF=E7=81=AF?= =?UTF-8?q?=E5=80=92=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../core/function/obu/mogo/MogoPrivateObuManager.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index ad1f24323f..a7e7b5d483 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -7,7 +7,6 @@ import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtils import com.mogo.eagle.core.utilcode.mogo.logger.Logger -import com.mogo.eagle.core.utilcode.util.LogUtils import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum @@ -515,8 +514,8 @@ class MogoPrivateObuManager private constructor() { } isGreenLight = false CallerHmiManager.showWarningTrafficLight(1) - val red = currentLight.count_down.toInt() + 1 - CallerHmiManager.changeCountdownRed(if (red >= 0) red else 0) + val red = currentLight.count_down.toInt() + CallerHmiManager.changeCountdownRed(red) ttsContent = EventTypeEnum.getWarningTts(appId.toString()) alertContent = EventTypeEnum.getWarningContent(appId.toString()) CallerHmiManager.changeCountdownGreen(0) @@ -538,8 +537,8 @@ class MogoPrivateObuManager private constructor() { } isRedLight = false CallerHmiManager.showWarningTrafficLight(3) - val green = currentLight.count_down.toInt() + 1 - CallerHmiManager.changeCountdownGreen(if (green >= 0) green else 0) + val green = currentLight.count_down.toInt() + CallerHmiManager.changeCountdownGreen(green) //防止数据出现问题的容错 CallerHmiManager.changeCountdownRed(0) CallerHmiManager.changeCountdownYellow(0) @@ -581,8 +580,8 @@ class MogoPrivateObuManager private constructor() { 0x3 -> { CallerHmiManager.disableWarningV2X(appId.toString()) CallerHmiManager.showWarningTrafficLight(2) - val yellow = currentLight.count_down.toInt() + 1 - CallerHmiManager.changeCountdownYellow(if (yellow >= 0) yellow else 0) + val yellow = currentLight.count_down.toInt() + CallerHmiManager.changeCountdownYellow(yellow) CallerHmiManager.changeCountdownGreen(0) CallerHmiManager.changeCountdownRed(0) }