Merge pull request #551 from PepperDash/hotfix/zoomroom-obtp-dialing

Hotfix/zoomroom obtp dialing

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/SystemMonitorController.cs

@@ -505,17 +505,23 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramInfo.RegistrationState = Program.RegistrationState;
 
                 ProgramStartedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Start);
+                ProgramStartedFeedback.FireUpdate();
+
                 ProgramStoppedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Stop);
+                ProgramStoppedFeedback.FireUpdate();
+
                 ProgramRegisteredFeedback =
                     new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Register);
+                ProgramRegisteredFeedback.FireUpdate();
+
                 ProgramUnregisteredFeedback =
                     new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Unregister);
+                ProgramUnregisteredFeedback.FireUpdate();
 
                 ProgramNameFeedback = new StringFeedback(() => ProgramInfo.ProgramFile);
                 ProgramCompileTimeFeedback = new StringFeedback(() => ProgramInfo.CompileTime);
                 CrestronDataBaseVersionFeedback = new StringFeedback(() => ProgramInfo.CrestronDb);
                 EnvironmentVersionFeedback = new StringFeedback(() => ProgramInfo.Environment);
-
                 AggregatedProgramInfoFeedback = new StringFeedback(() => JsonConvert.SerializeObject(ProgramInfo));
 
                 GetProgramInfo();

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -232,7 +232,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		/// </summary>
 		protected void SetIsReady()
 		{
-            CrestronInvoke.BeginInvoke( (o) =>
+			CrestronInvoke.BeginInvoke((o) =>
 				{
 					try
 					{
@@ -529,7 +529,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 				trilist.SetString(joinMap.CurrentParticipants.JoinNumber, participantsXSig);
 
-                trilist.SetUshort(joinMap.ParticipantCount.JoinNumber, (ushort) codec.Participants.CurrentParticipants.Count);
+				trilist.SetUshort(joinMap.ParticipantCount.JoinNumber, (ushort)codec.Participants.CurrentParticipants.Count);
 			};
 		}
 
@@ -564,7 +564,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				stringIndex += maxStrings;
 			}
 
-            while (meetingIndex < maxParticipants*offset)
+			while (meetingIndex < maxParticipants * offset)
 			{
 				tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
 				tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
@@ -596,6 +596,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			trilist.SetBoolSigAction(joinMap.SourceShareAutoStart.JoinNumber, (b) => AutoShareContentWhileInCall = b);
 		}
 
+		// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues
+		private List<Meeting> _currentMeetings = new List<Meeting>();
+
 		private void LinkVideoCodecScheduleToApi(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			trilist.SetSigFalseAction(joinMap.UpdateMeetings.JoinNumber, codec.GetSchedule);
@@ -605,10 +608,39 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				codec.CodecSchedule.MeetingWarningMinutes = i;
 			});
 
-            codec.CodecSchedule.MeetingsListHasChanged += (sender, args) => UpdateMeetingsList(codec, trilist, joinMap);
+			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues
+			trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
+			{
+				var mtg = 1;
+				var index = mtg - 1;
+				Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
+					mtg, joinMap.DialMeeting1.JoinNumber, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
+				if (_currentMeetings[index] != null)
+					Dial(_currentMeetings[index]);
+			});
+			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues				
+			trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
+			{
+				var mtg = 2;
+				var index = mtg - 1;
+				Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
+					mtg, joinMap.DialMeeting2.JoinNumber, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
+				if (_currentMeetings[index] != null)
+					Dial(_currentMeetings[index]);
+			});
+			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues
+			trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
+			{
+				var mtg = 3;
+				var index = mtg - 1;
+				Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
+					mtg, joinMap.DialMeeting3.JoinNumber, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
+				if (_currentMeetings[index] != null)
+					Dial(_currentMeetings[index]);
+			});
 
-            codec.CodecSchedule.MeetingEventChange +=
+			codec.CodecSchedule.MeetingsListHasChanged += (sender, args) => UpdateMeetingsList(codec, trilist, joinMap);
-                (sender, args) =>
+			codec.CodecSchedule.MeetingEventChange += (sender, args) =>
 				{
 					if (args.ChangeType == eMeetingEventChangeType.MeetingStartWarning)
 					{
@@ -620,30 +652,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		private void UpdateMeetingsList(IHasScheduleAwareness codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			var currentTime = DateTime.Now;
-            var currentMeetings =
-                codec.CodecSchedule.Meetings.Where(m => m.StartTime >= currentTime || m.EndTime >= currentTime).ToList();
 
-            var meetingsData = UpdateMeetingsListXSig(currentMeetings);
+			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues				
+			// - changed var currentMeetings >> field _currentMeetings
+			//_currentMeetings.Clear();
+			_currentMeetings = codec.CodecSchedule.Meetings.Where(m => m.StartTime >= currentTime || m.EndTime >= currentTime).ToList();
 
+			// TODO [ ] 2021-01-06, jkd: Added to debug OBTP dialing issues				
+			// - moved the trilist.SetSigFlaseAction(joinMap.DialMeeting1..3.JoinNumber) lambda's to LinkVideoCodecScheduleToApi
+
+			var meetingsData = UpdateMeetingsListXSig(_currentMeetings);
 			trilist.SetString(joinMap.Schedule.JoinNumber, meetingsData);
-
+			trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)_currentMeetings.Count);
-            trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
-            {
-                if(codec.CodecSchedule.Meetings[0] != null)
-                    Dial(codec.CodecSchedule.Meetings[0]);
-            });
-            trilist.SetSigFalseAction(joinMap.DialMeeting2.JoinNumber, () =>
-            {
-                if (codec.CodecSchedule.Meetings[1] != null)
-                    Dial(codec.CodecSchedule.Meetings[1]);
-            });
-            trilist.SetSigFalseAction(joinMap.DialMeeting3.JoinNumber, () =>
-            {
-                if (codec.CodecSchedule.Meetings[2] != null)
-                    Dial(codec.CodecSchedule.Meetings[2]);
-            });
-
-            trilist.SetUshort(joinMap.MeetingCount.JoinNumber, (ushort)currentMeetings.Count);
 		}
 
 		private string UpdateMeetingsListXSig(List<Meeting> meetings)
@@ -652,11 +672,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			const int maxDigitals = 2;
 			const int maxStrings = 7;
 			const int offset = maxDigitals + maxStrings;
-            var digitalIndex = maxStrings*maxMeetings; //15
+			var digitalIndex = maxStrings * maxMeetings; //15
 			var stringIndex = 0;
 			var meetingIndex = 0;
 
-            var tokenArray = new XSigToken[maxMeetings*offset];
+			var tokenArray = new XSigToken[maxMeetings * offset];
 			/* 
 			 * Digitals
 			 * IsJoinable - 1
@@ -669,19 +689,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			 * Start Time - 4
 			 * End Date - 5
 			 * End Time - 6
+			 * Id - 7
 			*/
 
 
-            foreach(var meeting in meetings)
+			foreach (var meeting in meetings)
 			{
 				var currentTime = DateTime.Now;
 
-                if(meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
+				if (meeting.StartTime < currentTime && meeting.EndTime < currentTime) continue;
 
-                if (meetingIndex >= maxMeetings*offset)
+				if (meetingIndex >= maxMeetings * offset)
 				{
 					Debug.Console(2, this, "Max Meetings reached");
-                    break;}
+					break;
+				}
 
 				//digitals
 				tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
@@ -702,10 +724,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				stringIndex += maxStrings;
 			}
 
-            while (meetingIndex < maxMeetings*offset)
+			while (meetingIndex < maxMeetings * offset)
 			{
 				Debug.Console(2, this, "Clearing unused data. Meeting Index: {0} MaxMeetings * Offset: {1}",
-                    meetingIndex, maxMeetings*offset);
+					meetingIndex, maxMeetings * offset);
 
 				//digitals
 				tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
@@ -745,7 +767,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			codec.DirectoryResultReturned += (sender, args) =>
 			{
-                trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort) args.Directory.CurrentDirectoryResults.Count);
+				trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)args.Directory.CurrentDirectoryResults.Count);
 
 				var clearBytes = XSigHelpers.ClearOutputs();
 
@@ -787,7 +809,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			var contactIndex = 1;
 			var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count];
 
-            foreach(var entry in directory.CurrentDirectoryResults)
+			foreach (var entry in directory.CurrentDirectoryResults)
 			{
 				var arrayIndex = contactIndex - 1;
 
@@ -800,7 +822,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 					continue;
 				}
 
-                if(isRoot && String.IsNullOrEmpty(entry.FolderId)) continue;
+				if (isRoot && String.IsNullOrEmpty(entry.FolderId)) continue;
 
 				tokenArray[arrayIndex] = new XSigSerialToken(contactIndex, entry.Name);
 
@@ -847,7 +869,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			var digitalIndex = maxStrings * maxCalls;
 			var arrayIndex = 0;
 
-            var tokenArray = new XSigToken[maxCalls*offset]; //set array size for number of calls * pieces of info
+			var tokenArray = new XSigToken[maxCalls * offset]; //set array size for number of calls * pieces of info
 
 			foreach (var call in ActiveCalls)
 			{
@@ -1048,7 +1070,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			codec.CameraSelected += (sender, args) =>
 			{
-                var i = (ushort) codec.Cameras.FindIndex((c) => c.Key == args.SelectedCamera.Key);
+				var i = (ushort)codec.Cameras.FindIndex((c) => c.Key == args.SelectedCamera.Key);
 
 				if (codec is IHasCodecRoomPresets)
 				{

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -1655,6 +1655,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         public override void Dial(Meeting meeting)
         {
+			Debug.Console(1, this,"Dialing meeting.Id: {0} Title: {1}", meeting.Id, meeting.Title);
             SendText(string.Format("zCommand Dial Start meetingNumber: {0}", meeting.Id));
         }