From fa153652292a3eea0a1884b59c0edfd037b5e094 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Mon, 14 Dec 2020 18:41:34 +0800
Subject: [PATCH] opt

---
 .../mogo/base/websocket/WebSocketManager.java |  2 -
 .../utils/CameraLiveNoticeHelper.java         | 49 ++++++++++++-------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
index 69b1640fab..9b7a498373 100644
--- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
+++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
@@ -183,7 +183,6 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin
         WebSocketData webSocketData = GsonUtil.objectFromJson(message, WebSocketData.class);
         int msgType = webSocketData.getMsgType();
         Logger.d(TAG, "websocket received msg type = " + msgType);
-//        Logger.d("liyz", "websocket received msg = " + message + "----type = " + msgType);
         //服务端下发数据返回，上传数据回执默认不返回
         if (msgType == MSG_TYPE_DOWNLINK_CAR_DATA.getMsgType()) {
             List<IMogoOnWebSocketMessageListener> listeners = mListeners.get(msgType);
@@ -192,7 +191,6 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin
                 while (iterator.hasNext()) {
                     IMogoOnWebSocketMessageListener listener = iterator.next();
                     if (listener != null) {
-//                        Logger.d("liyz", "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getData());
                         Logger.d(TAG, "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getData());
                         Object receiveObj = GsonUtil.objectFromJson(webSocketData.getData(),listener.target());
                         listener.onMsgReceived(receiveObj);
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 40de273e4a..db2ab3a8fc 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
@@ -42,14 +42,19 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
 //            mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
 //            mCloudRoadData.setLat(40.200353);
 //            mCloudRoadData.setLon(116.745467);
-//            CameraLiveManager.getInstance().init(mCloudRoadData);
+////            CameraLiveManager.getInstance().init(mCloudRoadData);
+//            addCameraMarker(mCloudRoadData);
 //        }, 2_000 );
-        
+    }
+
+    public void enterVrMode() {
+        Logger.d(TAG, "enterVrMode===");
+        MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).registerOnWebSocketMessageListener(this);
         ExtensionServiceManager
                 .getMogoRegisterCenter().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() {
             @Override
             public boolean onMarkerClicked(IMogoMarker marker) {
-                //点击的marker的具体数据 TODO
+                //点击的marker的具体数据
                 if (mCloudRoadData != null) {
                     CameraLiveManager.getInstance().init(mCloudRoadData);
                 } else {
@@ -61,10 +66,6 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         });
     }
 
-    public void enterVrMode() {
-        Logger.d(TAG, "enterVrMode===");
-        MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).registerOnWebSocketMessageListener(this);
-    }
 
     public void exitVrMode() {
         Logger.d(TAG, "退出vr模式===");
@@ -76,19 +77,19 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
      * @param roadData
      */
     private void addCameraMarker(CloudRoadData roadData) {
-        Logger.d(TAG, "addCameraMarker ------lat = " + roadData.getLat() + "--lon =" + roadData.getLon());
+        Logger.d(TAG, "addCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon());
         MogoMarkerOptions options = new MogoMarkerOptions()
                 .object(roadData)
                 .latitude(roadData.getLat())
                 .longitude(roadData.getLon());
-//        options.anchor(0.5f, 0.5f);
+        options.anchor(0.5f, 0.5f);
 
         Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_real_time_traffic, null);
         options.icon(bitmap);
         mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
                         .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        //TODO
 
+        mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
     }
 
     private void removeCameraMarker() {
@@ -97,7 +98,6 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         }
     }
 
-
     @Override
     public WebSocketMsgType getDownLinkType() {
         return WebSocketMsgType.MSG_TYPE_DOWNLINK_CAR_DATA;
@@ -108,25 +108,36 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         return MogoSnapshotSetData.class;
     }
 
+    private double mCurrentlat;
+    private double mCurrentlon;
+
     /**
      *
      * @param obj
      */
     @Override
     public void onMsgReceived(MogoSnapshotSetData obj) {
-        Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
-        if (obj != null) {
+//        Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
+        if (obj != null) { //如果多个点，如何处理，点击的时候
             mCloudRoadData = obj.getCamera();
             if (mCloudRoadData != null) {
-                Logger.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl());
-                //添加marker TODO
-                addCameraMarker(mCloudRoadData);
+                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());
+                if (mCurrentlat == mCloudRoadData.getLat() && mCurrentlon == mCloudRoadData.getLon()) {
+                    //TODO
+                } else {
+                    removeCameraMarker();
+                    addCameraMarker(mCloudRoadData);
+                    mCurrentlat = mCloudRoadData.getLat();
+                    mCurrentlon = mCloudRoadData.getLon();
+                }
             } else {
-                //删除marker TODO
+                //删除marker
+                Logger.e(TAG, "onMsgReceived mCloudRoadData == null " );
                 UiThreadHandler.postDelayed( () -> {
                     removeCameraMarker();
-                }, 2_000 );
-
+                }, 1_000 );
             }
         } else {
             Log.e(TAG, "onMsgReceived  obj == null ");