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

Merge branch 'dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-220_211207_8.0.15

Browse Source 
# Conflicts:
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapLocationListenerManager.kt
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java
This commit is contained in:
donghongyu
2021-12-23 14:27:49 +08:00
parent b228c39f87 b215f86274
commit d7dece4f7b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
private var vip: Boolean = false
@Volatile
private var enter: Boolean = false
private var exit: Boolean = true
private var result: TrafficLightResult? = null
private var lastResult: TrafficLightStatus? = null
@@ -99,7 +99,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
if (!vip) {
return
}
if (enter) {
if (!exit) {
Logger.d(TAG, "驶入路口，返回 , then resetConditions")
resetConditions()
return
@@ -226,7 +226,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
override fun onEnterCrossRoad(enter: Boolean) {
super.onEnterCrossRoad(enter)
UiThreadHandler.post {
this.enter = enter
this.exit = enter
}
}