From b3bdaace504cb9f5f52074e4be05b9c1c85371bd Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 22 Dec 2020 10:51:24 +0800
Subject: [PATCH 1/3] opt

---
 .../module/extensions/utils/CameraLiveNoticeHelper.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 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 c116e42b25..0ef79a66ee 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
@@ -47,7 +47,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
                 .getMogoRegisterCenter().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() {
             @Override
             public boolean onMarkerClicked(IMogoMarker marker) {
-                //点击的marker的具体数据
+                //点击的marker的具体数据 TODO
                 if (mCloudRoadData != null && !TextUtils.isEmpty(mCloudRoadData.getRtmpUrl())) {
                     CameraLiveManager.getInstance().init(mCloudRoadData);
                 } else {
@@ -153,8 +153,8 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
     public void onMsgReceived(MogoSnapshotSetData obj) {
         Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
         if (obj != null) {
-            mCloudRoadData = obj.getCamera();
-            if (mCloudRoadData != null) {
+            if (obj.getCamera() != null && !TextUtils.isEmpty(obj.getCamera().getRtmpUrl())) {
+                mCloudRoadData = obj.getCamera();
                 Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
                 if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) {
                     if (isVrMode == isVrModeMarker) {

From 8d10c3f08b0f5f505ec07591c57d4fab441f857b Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 22 Dec 2020 11:25:14 +0800
Subject: [PATCH 2/3] opt

---
 .../mogo/module/extensions/utils/CameraLiveNoticeHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0ef79a66ee..84d94f0557 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
@@ -173,7 +173,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
                     }
                 } else {
                     mCurrentUuid = mCloudRoadData.getUuid();
-                    if (isVrMode) {
+                    if (isVrMode) { //TODO 是否需要延迟
                         Log.d(TAG, "-------------4------------");
                         addVrCameraMarker(mCloudRoadData);
                         isVrModeMarker = true;

From edc577080df3c6c9b45a09f64e4ffea80cda9aad Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Tue, 22 Dec 2020 11:31:24 +0800
Subject: [PATCH 3/3] update callchat

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c8f3f6bff7..e4678cb16f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -138,7 +138,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.31
+CARCHATTING_VERSION=2.2.32
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.8
 # websocket