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

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() {
@@ -117,13 +119,13 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
      */
     @Override
     public void onMsgReceived(MogoSnapshotSetData obj) {
-//        Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
+        Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
         if (obj != null) { //如果多个点，如何处理，点击的时候
             mCloudRoadData = obj.getCamera();
             if (mCloudRoadData != null) {
                 Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl());
-//                Log.d(TAG, "mCurrentlat = " + mCurrentlat + "--mCurrentlon = " +mCurrentlon);
-//                Log.d(TAG, "mCloudRoadData.getLat() = " + mCloudRoadData.getLat() + "--mCloudRoadData.getLon() = " + mCloudRoadData.getLon());
+                Log.d(TAG, "mCurrentlat = " + mCurrentlat + "--mCurrentlon = " +mCurrentlon);
+                Log.d(TAG, "mCloudRoadData.getLat() = " + mCloudRoadData.getLat() + "--mCloudRoadData.getLon() = " + mCloudRoadData.getLon());
                 if (mCurrentlat == mCloudRoadData.getLat() && mCurrentlon == mCloudRoadData.getLon()) {
                     //TODO
                 } else {