From 9bce99607d11cc073765775a7925f89f578deee0 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 24 Nov 2021 00:01:07 +0800
Subject: [PATCH] fix ui problem

---
 .../trafficlight/TrafficLightHMIManager.kt    | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
index ea333b6491..08e0e109ee 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
@@ -15,7 +15,7 @@ class TrafficLightHMIManager {
 
     private var initView: Boolean = false
 
-    fun isWarningTrafficLightShow():Boolean{
+    fun isWarningTrafficLightShow(): Boolean {
         return CallerHmiManager.isWarningTrafficLightShow()
     }
 
@@ -31,34 +31,27 @@ class TrafficLightHMIManager {
     }
 
     private fun callerHMIToChangeLight(trafficLightStatus: TrafficLightStatus) {
+        val remain = if (trafficLightStatus.remain > 99) {
+            99
+        } else {
+            trafficLightStatus.remain
+        }
         when {
-            trafficLightStatus.isGreen() -> {
+            trafficLightStatus.isGreen() || trafficLightStatus.isFlashGreen() -> {
                 CallerHmiManager.showWarningTrafficLight(3)
-                if (trafficLightStatus.remain != 99999) {
-                    CallerHmiManager.changeCountdownGreen(trafficLightStatus.remain)
-                    CallerHmiManager.changeCountdownRed(-1)
-                    CallerHmiManager.changeCountdownYellow(-1)
-                }
-            }
-            trafficLightStatus.isFlashGreen() -> {
-                CallerHmiManager.showWarningTrafficLight(3)
-                CallerHmiManager.changeCountdownGreen(trafficLightStatus.remain)
+                CallerHmiManager.changeCountdownGreen(remain)
                 CallerHmiManager.changeCountdownRed(-1)
                 CallerHmiManager.changeCountdownYellow(-1)
             }
             trafficLightStatus.isYellow() -> {
                 CallerHmiManager.showWarningTrafficLight(2)
-                CallerHmiManager.changeCountdownYellow(trafficLightStatus.remain)
+                CallerHmiManager.changeCountdownYellow(remain)
                 CallerHmiManager.changeCountdownGreen(-1)
                 CallerHmiManager.changeCountdownRed(-1)
             }
             trafficLightStatus.isRed() -> {
                 CallerHmiManager.showWarningTrafficLight(1)
-                if (trafficLightStatus.remain == 99999) {
-                    CallerHmiManager.changeCountdownRed(99)
-                } else {
-                    CallerHmiManager.changeCountdownRed(trafficLightStatus.remain)
-                }
+                CallerHmiManager.changeCountdownRed(remain)
                 CallerHmiManager.changeCountdownGreen(-1)
                 CallerHmiManager.changeCountdownYellow(-1)
             }