From dfdf1299dc593df1cb437811d421b91ecdf8ec12 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 16 Jul 2024 12:23:25 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=E7=BA=A2=E7=81=AF=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B65=E7=A7=92=E6=97=A0=E8=AF=AD=E9=9F=B3=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/datacenter/v2x/TrafficLightDispatcher.kt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
index e94e6bd1f9..51ba8a98c7 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
@@ -97,6 +97,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
 
     private var currentSpeed: Float = 0f
     private var isPrompted: Boolean = false //是否提示过起步提醒/提前减速，每个路口仅提示一次
+    private var isTurnGreen: Boolean = false
 
     fun initServer(context: Context) {
         mContext = context
@@ -172,6 +173,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                                 CallerTrafficLightListenerManager.disableTrafficLight()
                                 hasFusionLightStatus = false
                                 isPrompted = false
+                                isTurnGreen = false
                             }else{
                                 //倒计时，超时还未更新数据则隐藏红绿灯
                                 lastLightTime = System.currentTimeMillis()
@@ -186,6 +188,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                                                     lightCountDownTimer = null
                                                     hasFusionLightStatus = false
                                                     isPrompted = false
+                                                    isTurnGreen = false
                                                 }
                                             }
 
@@ -196,6 +199,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                                                 lightCountDownTimer = null
                                                 hasFusionLightStatus = false
                                                 isPrompted = false
+                                                isTurnGreen = false
                                             }
 
                                         }
@@ -221,14 +225,17 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                                  * 车辆行驶中，若判断当前绿灯自车基于当前速度需提速10%以上才可通过时，提示“蘑菇提醒您及时减速，避免路口急刹”
                                  * 车辆行驶中，若判断当前红灯自车基于当前速度需降低60%以上才可通过时，提示“蘑菇提醒您及时减速，避免路口急刹”
                                  */
-                                if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !isPrompted){
+                                if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !isTurnGreen){
                                     //车辆等红灯，在红/黄灯剩余5s且下一灯态为绿灯时，提示“红灯即将变绿”；并在变为绿灯时有提示起步的动效
                                     if((light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_YELLOW_FUSION || light.state ==FusionTrafficLightOuterClass.FusionLightState.STATE_RED_FUSION)
                                         && light.duration < 5 && light.nextState == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION){
                                         //语音播放:红灯即将变绿
                                         AIAssist.getInstance(mContext).speakTTSVoice("红灯即将变绿")
-                                        isPrompted = true
+                                        isTurnGreen = true
                                     }
+                                }
+
+                                if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !isPrompted){
                                     //车辆行驶中，若判断当前绿灯自车无法通过，在绿灯剩余5s且下一灯态为红/黄灯时，提示“蘑菇提醒您及时减速，避免路口急刹”
                                     if(light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION && light.duration < 5){
                                         CallerMapRoadListenerManager.getStopLineDistance()?.let { dis->