Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9

# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
This commit is contained in:
wangcongtao
2021-01-07 18:59:09 +08:00
22 changed files with 284 additions and 113 deletions

View File

@@ -13,6 +13,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.location.MogoLocation;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XObuEventEntity;
import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -178,6 +179,10 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
@Override
public void onEventInfoCallback(MogoObuEventInfo info) {
Logger.d("V2X_OBU_EVENT", "carEventInfo==" + info);
if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
Logger.d("V2X_OBU_EVENT","vr模式下不展示obu事件");
return;
}
Long last = intervalMap.get(info.getTypeCode());
if (last == null) {
last = 0L;