Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

2020-12-15 20:58:40 +08:00
parent c9768ebebc a5c9e76a88
commit 157deeaa32
2 changed files with 3 additions and 1 deletions
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -89,7 +89,9 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
                        .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);

-        mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+        if (mMogoMarker != null) {
+            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+        }
    }

    private void removeCameraMarker() {
--- a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png
+++ b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png