From c5584d0a549acb42868551bc3bb2d76056d2bb7a Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Sun, 20 Dec 2020 14:16:34 +0800
Subject: [PATCH] opt

---
 .../utils/CameraLiveNoticeHelper.java         | 24 ++++++++++++++++---
 .../service/location/MogoRTKLocation.java     |  1 -
 2 files changed, 21 insertions(+), 4 deletions(-)

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 9496d677b9..9b6b78f872 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
@@ -53,27 +53,45 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
                 if (mCloudRoadData != null) {
                     CameraLiveManager.getInstance().init(mCloudRoadData);
                 } else {
-                    Logger.e(TAG, " mCloudRoadData == null ");
+                    Logger.e(TAG, " onMarkerClicked mCloudRoadData == null ");
                 }
 
                 return false;
             }
         });
+
     }
 
     public void release() {
         MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).unregisterOnWebSocketMessageListener(this);
+        mCloudRoadData = null;
     }
 
     public void enterVrMode() {
         Logger.d(TAG, "进入vr模式===");
         isVrMode = true;
+
+        //test
+//        CloudRoadData cloudRoadData = new CloudRoadData();
+//        cloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
+//        //shunyi
+//        cloudRoadData.setLat(40.200583);
+//        cloudRoadData.setLon(116.738538);
+//        addVrCameraMarker(cloudRoadData);
     }
 
 
     public void exitVrMode() {
         Logger.d(TAG, "退出vr模式===");
         isVrMode = false;
+
+        //test
+//        CloudRoadData mCloudRoadData = new CloudRoadData();
+//        mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
+//        //shunyi
+//        mCloudRoadData.setLat(40.200583);
+//        mCloudRoadData.setLon(116.738538);
+//        addNormalCameraMarker(mCloudRoadData);
     }
 
     /**
@@ -143,7 +161,6 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
 
     private volatile boolean isLoadVr = false;
     private volatile boolean isLoadNormal = false;
-
     private volatile String mCurrentUuid;
 
 
@@ -155,6 +172,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
         if (obj != null) {
             mCloudRoadData = obj.getCamera();
+
             if (mCloudRoadData != null) {
                 Log.e(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
                 if (mCurrentUuid != null && mCurrentUuid.equals(mCloudRoadData.getUuid())) {
@@ -181,7 +199,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
                 } else {
                     mCurrentUuid = mCloudRoadData.getUuid();
                     Log.e(TAG, "mCurrentUuid == null " + "-----isVrMode = " + isVrMode);
-                    if (isVrMode) {
+                    if (isVrMode) { //TODO
                         Log.d(TAG, "addVrCameraMarker1 ------------11111-------- ");
                         addVrCameraMarker(mCloudRoadData);
                     } else {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
index dba93d41c8..8e78ec805e 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
@@ -123,7 +123,6 @@ public class MogoRTKLocation {
                 cloudLocationInfo.setSatelliteTime(location.getTime());
                 cloudLocationInfo.setSystemTime(System.currentTimeMillis());
 
-//                Log.e("liyz", "lat = " + location.getLatitude() + ">>>>long = " + location.getLongitude());
                 cacheList.add(cloudLocationInfo);
             } else {
                 Logger.e(TAG, "location == null");