From 7c8bcd1e09a20814f3597963e2c814de4271316d Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 13 Jan 2023 18:27:14 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.2]fix=E7=BA=A2=E7=BB=BF=E7=81=AFOBU?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=92=8CAI=E4=BA=91=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E3=80=81=E5=B1=95=E7=A4=BA=E7=81=AF=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AA=E7=83=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trafficlight/core/MogoTrafficLightManager.kt   | 12 ++++++------
 .../trafficlight/core/TrafficLightDispatcher.kt    | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
index 332fe3ba85..f8864f79a2 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -98,10 +98,10 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                                     2_000L
                                 )
                             }
-                            if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-                                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                                CallerTrafficLightListenerManager.resetTrafficLightData()
-                            }
+//                            if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
+//                                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+//                                CallerTrafficLightListenerManager.resetTrafficLightData()
+//                            }
                             CallerTrafficLightListenerManager.invokeTrafficRequestError()
 
                         })
@@ -137,8 +137,8 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                     trafficLightResult = null
                     firstLoopCrossRoad = true
                     mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT)
-                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                    CallerTrafficLightListenerManager.resetTrafficLightData()
+//                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+//                    CallerTrafficLightListenerManager.resetTrafficLightData()
                 }
             }
         }
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
index 2b0c7209b5..03ca1b2c9d 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
@@ -114,7 +114,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     }
 
     /**
-     * 车辆进入路口
+     * 车辆进入路口回调
+     * @param enter true:进入路口；false:离开路口
      */
     override fun onEnterCrossRoad(enter: Boolean) {
         if (!enter) {
@@ -122,6 +123,11 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                 hasAiLightStatus = false
                 hasObuLightStatus = false
             }, 5000)
+            CallerTrafficLightListenerManager.resetTrafficLightData()
+            //如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理
+            if(!hasObuLightStatus){
+                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+            }
         }
     }
 
@@ -130,6 +136,12 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      */
     override fun onTrafficRequestError() {
         hasAiLightStatus = false
+        CallerTrafficLightListenerManager.resetTrafficLightData()
+        if(!hasObuLightStatus){
+            if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
+                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+            }
+        }
     }
 
     /**