Merge branch 'dev_MogoAP_eagle-1030_211020_8.0.14'

# 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-22 19:35:10 +08:00

View File

@@ -99,7 +99,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
if (!vip) {
return
}
if (enter) {
if (!enter) {
Logger.d(TAG, "驶入路口,返回 , then resetConditions")
resetConditions()
return