pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix testing with Zoom PC to find what is triggering a layout change. Currently unresolved

Browse Source
This commit is contained in:
jkdevito
2020-11-30 14:29:57 -06:00
parent 14ad0eee48
commit b41dd23c7f
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
View File

@@ -96,7 +96,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
Audio = new zConfiguration.Audio(); Audio = new zConfiguration.Audio();
Video = new zConfiguration.Video(); Video = new zConfiguration.Video();
Client = new zConfiguration.Client(); Client = new zConfiguration.Client();
Camera = new zConfiguration.Camera(); Camera = new zConfiguration.Camera();
} }
} }

20
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -491,9 +491,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
}; };
Status.Call.Sharing.PropertyChanged += (o, a) => Status.Call.Sharing.PropertyChanged += (o, a) =>
{ {
if (a.PropertyName == "State") if (a.PropertyName == "State")
{ {
Debug.Console(1, this, "[SetUpFeedbackActions] Status.Call.Sharing.PropertyChanged: {0}", Status.Call.Sharing.State);
SharingContentIsOnFeedback.FireUpdate(); SharingContentIsOnFeedback.FireUpdate();
ReceivingContent.FireUpdate(); ReceivingContent.FireUpdate();
} }
@@ -904,7 +905,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
case "call": 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; break;
} }
@@ -1386,10 +1389,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
if (Status.Call != null) if (Status.Call != null)
{ {
var callStatus = Status.Call.Status; 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 not currently in a meeting, intialize the call object
if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING) if (callStatus != zStatus.eCallStatus.IN_MEETING || callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
{ {
Status.Call = new zStatus.Call {Status = callStatus}; Status.Call = new zStatus.Call {Status = callStatus};
SetUpCallFeedbackActions(); SetUpCallFeedbackActions();
@@ -1417,8 +1421,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
ActiveCalls.Add(newCall); ActiveCalls.Add(newCall);
Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}", 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); OnCallStatusChange(newCall);
} }
} }
@@ -1437,8 +1441,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
} }
Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}", 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); OnCallStatusChange(existingCall);
} }
} }