diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
index fff8ed9203..3aeb34605d 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
@@ -28,9 +28,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
     private MogoImageView mIvReportHead;
     private ImageView pushVideoClose;
 
-    // 弹窗状态监听
-//    private CameraLiveWindowStatusListener mWindowStatusListener;
-
     // 直播30秒自动关闭
     private static Handler handlerV2XEvent = new Handler();
     private static Runnable runnableV2XEvent;
@@ -84,9 +81,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
             }
 
             countDownV2XEvent(entity);
-//            if (mWindowStatusListener != null) {
-//                mWindowStatusListener.onViewShow();
-//            }
         }
     }
 
@@ -97,16 +91,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
 
     @Override
     public void close() {
-        // 修改地图比例
-//        V2XServiceManager.getMoGoStatusManager().setUserInteractionStatus(MODULE_NAME, true, false);
-        // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随
-//        MarkerUtils.resetMapZoom(16);
-
-        // 如果窗体处于展示的时候
-//        if (mWindowStatusListener != null) {
-//            mWindowStatusListener.onViewClose();
-//        }
-
         // 停止倒计时
         if (handlerV2XEvent != null && runnableV2XEvent != null) {
             handlerV2XEvent.removeCallbacks(runnableV2XEvent);
@@ -119,12 +103,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
                 .removeView(this);
     }
 
-
-//    @Override
-//    public void setWindowStatusListener(CameraLiveWindowStatusListener listener) {
-//        this.mWindowStatusListener = listener;
-//    }
-
     /**
      * 窗体倒计时 TODO
      */
diff --git 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
index 2374b039fa..c116e42b25 100644
--- 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
@@ -25,10 +25,10 @@ import com.mogo.utils.logger.Logger;
 
 
 /**
- * vr模式下，红绿灯消息 AdasNoticeHelper
+ * vr模式下，摄像头消息 AdasNoticeHelper
  */
 public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<MogoSnapshotSetData> {
-    private static final String TAG = "liyz";
+    private static final String TAG = "CameraLiveNoticeHelper";
     private Context mContext;
     private static IMogoMarker mMogoMarker;
     private CloudRoadData mCloudRoadData;
@@ -84,22 +84,23 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
      */
     private void addVrCameraMarker(CloudRoadData roadData) {
         Logger.d(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        Log.d("lixp", "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        removeCameraMarker();
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(roadData)
-                .latitude(roadData.getLat())
-                .longitude(roadData.getLon());
-        options.anchor(0.5f, 0.5f);
+        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
+            removeCameraMarker();
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .object(roadData)
+                    .latitude(roadData.getLat())
+                    .longitude(roadData.getLon());
+            options.anchor(0.5f, 0.5f);
 
-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
-        options.icon(bitmap);
-        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
-                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        if (mMogoMarker != null) {
-            mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
-            mMogoMarker.showInfoWindow();
-            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
+            options.icon(bitmap);
+            mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+            if (mMogoMarker != null) {
+                mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
+                mMogoMarker.showInfoWindow();
+                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            }
         }
     }
 
@@ -110,22 +111,22 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
      */
     private void addNormalCameraMarker(CloudRoadData roadData) {
         Logger.d(TAG, "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        Log.d("lixp", "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        removeCameraMarker();
-        mMogoMarker.hideInfoWindow();
+        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
+            removeCameraMarker();
+            mMogoMarker.hideInfoWindow();
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .object(roadData)
+                    .latitude(roadData.getLat())
+                    .longitude(roadData.getLon());
+            options.anchor(0.5f, 0.5f);
 
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(roadData)
-                .latitude(roadData.getLat())
-                .longitude(roadData.getLon());
-        options.anchor(0.5f, 0.5f);
-
-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
-        options.icon(bitmap);
-        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
-                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        if (mMogoMarker != null) {
-            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
+            options.icon(bitmap);
+            mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+            if (mMogoMarker != null) {
+                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            }
         }
     }
 
@@ -154,26 +155,30 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         if (obj != null) {
             mCloudRoadData = obj.getCamera();
             if (mCloudRoadData != null) {
-                Logger.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
+                Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
                 if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) {
                     if (isVrMode == isVrModeMarker) {
                         // do nothing.
+                        Log.e(TAG, "-------------1------------");
                     } else {
                         if (isVrMode) {
                             addVrCameraMarker(mCloudRoadData);
                             isVrModeMarker = true;
+                            Log.d(TAG, "-------------2------------");
                         } else {
                             addNormalCameraMarker(mCloudRoadData);
+                            Log.d(TAG, "-------------3------------");
                             isVrModeMarker = false;
                         }
                     }
                 } else {
-                    Logger.d(TAG, "mCurrentUuid  !=   ----------");
                     mCurrentUuid = mCloudRoadData.getUuid();
                     if (isVrMode) {
+                        Log.d(TAG, "-------------4------------");
                         addVrCameraMarker(mCloudRoadData);
                         isVrModeMarker = true;
                     } else {
+                        Log.d(TAG, "-------------5------------");
                         addNormalCameraMarker(mCloudRoadData);
                         isVrModeMarker = false;
                     }