This commit is contained in:
zhongchao
2022-09-20 16:12:08 +08:00
parent b343175773
commit b94325b343

View File

@@ -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) {