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

@@ -158,12 +158,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
@Override
public void onMsgReceived( MogoSnapshotSetData data ) {
if ( data == null ) {
return;
}
if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) {
return;
}
// if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
//// return;
// }