yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source
This commit is contained in:
donghongyu
2021-11-16 18:36:12 +08:00
parent 15641bfc4f 9b1b147a2e
commit 64aa3fe35b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
View File

@@ -6,7 +6,6 @@ import com.mogo.cloud.commons.utils.CoordinateUtils
import com.mogo.eagle.core.data.map.MogoLatLng
import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
import com.mogo.eagle.core.data.trafficlight.isRed
import com.mogo.eagle.core.data.trafficlight.turnRedAtOnce
import com.mogo.eagle.core.data.v2x.VipMessage
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
@@ -85,16 +84,22 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
if (trafficLightResult.currentRoadTrafficLight() == null) {
Logger.d(TAG, "vip 获取到灯态，但没找到对应车道数据 result : $trafficLightResult")
return
}
if (!turnLightFirst && trafficLightResult.currentRoadTrafficLight()!!.isRed()) {
if (!turnLightFirst) {
// 首次判断，变灯
turnLightFirst = true
Logger.d(TAG, "触发变灯")
turnLight()
}
val currentResult = trafficLightResult.currentRoadTrafficLight()
val lastResult = result!!.currentRoadTrafficLight()
Logger.d(
TAG,
"检查是否变灯 last.remain : ${lastResult!!.remain} , current.remain : ${currentResult!!.remain}"
)
this.result = trafficLightResult
//如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗
@@ -106,6 +111,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
object : IMoGoWarningStatusListener {
override fun onShow() {}
override fun onDismiss() {
Logger.d(TAG, "showWarningV2X vip dismiss , reset turnLightFirst to false ")
turnLightFirst = false
turnLightEnd = true
}