From b41dd23c7f456c1c8b6f9879efe3f5a5acd32671 Mon Sep 17 00:00:00 2001 From: jkdevito Date: Mon, 30 Nov 2020 14:29:57 -0600 Subject: [PATCH] Hotfix testing with Zoom PC to find what is triggering a layout change. Currently unresolved --- .../VideoCodec/ZoomRoom/ResponseObjects.cs | 2 +- .../VideoCodec/ZoomRoom/ZoomRoom.cs | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs index 4f4eddbc..3be18c1d 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs @@ -96,7 +96,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom Audio = new zConfiguration.Audio(); Video = new zConfiguration.Video(); Client = new zConfiguration.Client(); - Camera = new zConfiguration.Camera(); + Camera = new zConfiguration.Camera(); } } diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs index 97cfd954..3c07bcfc 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs @@ -491,9 +491,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom }; Status.Call.Sharing.PropertyChanged += (o, a) => - { + { if (a.PropertyName == "State") - { + { + Debug.Console(1, this, "[SetUpFeedbackActions] Status.Call.Sharing.PropertyChanged: {0}", Status.Call.Sharing.State); SharingContentIsOnFeedback.FireUpdate(); ReceivingContent.FireUpdate(); } @@ -904,7 +905,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom { case "call": { - JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Call); + Debug.Console(1, this, "[DeserializeResponse] sharing status 1: {0}", Status.Call.Sharing.State.ToString()); + JsonConvert.PopulateObject(responseObj.ToString(), Configuration.Call); + Debug.Console(1, this, "[DeserializeResponse] sharing status 2: {0}", Status.Call.Sharing.State.ToString()); break; } @@ -1386,10 +1389,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom if (Status.Call != null) { var callStatus = Status.Call.Status; + Debug.Console(1, this, "[UpdateCallStatus] callStatus: {0}", callStatus.ToString()); // If not currently in a meeting, intialize the call object if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING) - { + { Status.Call = new zStatus.Call {Status = callStatus}; SetUpCallFeedbackActions(); @@ -1417,8 +1421,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom ActiveCalls.Add(newCall); Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}", - Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call"); - + Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call"); + OnCallStatusChange(newCall); } } @@ -1437,8 +1441,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom } Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}", - Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call"); - + Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call"); + OnCallStatusChange(existingCall); } }