From b94325b343135b08f793df01b3fb904faf65258e Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 20 Sep 2022 16:12:08 +0800
Subject: [PATCH] fix bug

---
 .../core/function/v2x/vip/VipCarManager.kt    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
index 14637ab334..998d98c934 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -43,8 +43,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     }
 
     private var mContext: Context? = null
-    private var turnLightFirst = false
-    private var turnLightEnd = true
+    private var turnLight = false
     private var vip: Boolean = false
 
     @Volatile
@@ -100,9 +99,9 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     }
 
     override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
-//        if (!vip) {
-//            return
-//        }
+        if (!vip) {
+            return
+        }
 
         if (exit) {
             CallerLogger.d("$M_V2X$TAG", "驶离路口，返回 , then  resetConditions")
@@ -124,14 +123,14 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         val lastResult = result?.currentRoadTrafficLight()
         CallerLogger.d(
             "$M_V2X$TAG",
-            "检查是否变灯 last.remain  : ${lastResult?.remain} , color : ${lastResult?.color} , current.remain : ${currentResult?.remain} , color : ${currentResult?.color}, turnLightFirst : $turnLightFirst"
+            "检查是否变灯 last.remain  : ${lastResult?.remain} , color : ${lastResult?.color} , current.remain : ${currentResult?.remain} , color : ${currentResult?.color}, turnLight : $turnLight"
         )
 
         this.result = trafficLightResult
 
-        if (!turnLightFirst) {
+        if (!turnLight) {
             // 首次判断，变灯
-            turnLightFirst = true
+            turnLight = true
             val controlTime = if (currentResult!!.isGreen()) 45 - currentResult.remain else 45
             CallerLogger.d("$M_V2X$TAG", "触发变灯 , controlTime : $controlTime")
             turnLight(controlTime)
@@ -140,8 +139,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     }
 
     private fun resetConditions() {
-        turnLightFirst = false
-        turnLightEnd = true
+        turnLight = false
         result = null
     }
 
@@ -192,7 +190,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         }
     }
 
-    fun turnLight(controlTime: Int) {
+    private fun turnLight(controlTime: Int) {
         if (result == null || mContext == null) return
         val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!)
         if (locationClient != null) {