From c2ef744ee6938247a749348fd92d2db8a6cc79e3 Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Mon, 23 May 2022 17:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改AI云隐藏红绿灯逻辑，兼容感知红绿灯
---
 .../trafficlight/core/MogoTrafficLightManager.kt   | 14 +++++++++-----
 .../trafficlight/core/TrafficLightDispatcher.kt    |  2 +-
 2 files changed, 10 insertions(+), 6 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 ae399ce8ad..2adcd9609a 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
@@ -4,6 +4,7 @@ import android.content.Context
 import android.location.Location
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.data.trafficlight.RoadIDResult
 import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
@@ -39,6 +40,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
     private var trafficLightResult: TrafficLightResult? = null
 
     private var inRange: Boolean = false
+    private var firstLoopCrossRoad: Boolean = true //开启循环请求路口
 
     private var mThreadHandler: Handler? = null
 
@@ -48,11 +50,12 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
             .registerCenterApi.registerCarLocationChangedListener(TAG, this)
         mThreadHandler =
             TrafficLightThreadHandler(Looper.getMainLooper(), {
-                //查询路口时，如果红绿灯显示，则隐藏掉
-//                if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-//                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-//                    CallTrafficLightListenerManager.resetTrafficLightData()
-//                }
+                //第一次查询路口时，如果红绿灯显示，则隐藏掉
+                if(firstLoopCrossRoad && TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()){
+                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+                    CallTrafficLightListenerManager.resetTrafficLightData()
+                }
+                firstLoopCrossRoad = false
                 mLocation?.let { it ->
                     val tileId = CallerMapUIServiceManager.getMapUIController()?.getTileId(it.longitude, it.latitude) ?: 0
                     trafficLightNetWorkModel.requestRoadID(
@@ -134,6 +137,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                     CallTrafficLightListenerManager.invokeEnterCrossRoad(false)
                     inRange = false
                     trafficLightResult = null
+                    firstLoopCrossRoad = true
                     mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT)
                     TrafficLightHMIManager.INSTANCE.hideTrafficLight()
                     CallTrafficLightListenerManager.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 e140dee55d..d1fb850bd2 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
@@ -59,7 +59,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener , IMoGoTrafficLigh
                 }
                 if(light == null){
                     //隐藏红绿灯显示
-                    CallerHmiManager.showWarningTrafficLight(0)
+                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
                 }else{
                     when (light.state) {
                         TrafficLightOuterClass.LightState.STATE_RED -> {