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 708abe34..19ed01d3 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 @@ -1371,6 +1371,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom public bool CanEditClosedCaption { get; set; } [JsonProperty("can_record")] public bool CanRecord { get; set; } + // TODO [ ] 2021-07-20, jkd: Evaluate if event can be used to re-poll participant list + // - when in waiting room: "event": "ZRCUserChangedEventJoinedMeeting", + // - when admitted to call: "event": "ZRCUserChangedEventUserInfoUpdated", + // ISSUE [ ] when a zoom rooms device connects to a call with a waiting room, once admitted the zoom rooms device will be present 2x's in the participant list + // - each instance of the zoom rooms device will have a unique user id [JsonProperty("event")] public string Event { get; set; } [JsonProperty("hand_status")] @@ -1587,7 +1592,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom public string schedule_option2 { get; set; } public string support_callout_type { get; set; } public string toll_free_number { get; set; } - public string user_type { get; set; } + public string user_type { get; set; } public InfoResult() { 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 fc3f14a9..48e7e3c2 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 @@ -970,9 +970,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom SendText("echo off"); Thread.Sleep(100); // set feedback exclusions - SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callin_country_list"); + // TODO [ ] 2021-07-02, jkd - Verify if the /info/ vs /Info/ exludes the unwanted data + SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callin_country_list"); Thread.Sleep(100); - SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list"); + SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callout_country_list"); + Thread.Sleep(100); + SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/toll_free_callin_list"); Thread.Sleep(100); if (!_props.DisablePhonebookAutoDownload) @@ -1278,6 +1281,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom var disconnectEvent = JsonConvert.DeserializeObject(responseObj.ToString()); + // TODO [ ] 2021-07-20, jkd + Debug.Console(1, this, "zEvent disconnectEvent.Successful: {0}", disconnectEvent.Successful); + if (disconnectEvent.Successful) { if (ActiveCalls.Count > 0) @@ -1585,7 +1591,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom break; } - var newCall = new CodecActiveCallItem { Status = newStatus }; + // TODO [ ] 2021-07-20, jkd: Updated to populate name and ID when a new call is constructred + var newCall = new CodecActiveCallItem + { + Name = Status.Call.Info.meeting_list_item.meetingName, + Id = Status.Call.Info.meeting_id, + Status = newStatus + }; ActiveCalls.Add(newCall); @@ -1601,7 +1613,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom switch (callStatus) { - case zStatus.eCallStatus.IN_MEETING: + case zStatus.eCallStatus.IN_MEETING: existingCall.Status = eCodecCallStatus.Connected; break; case zStatus.eCallStatus.NOT_IN_MEETING: @@ -1641,7 +1653,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom //clear participants list after call cleanup if (ActiveCalls.Count == 0) { - Participants.CurrentParticipants = new List(); + var emptyList = new List(); + Participants.CurrentParticipants = emptyList; } }