style: Updated formatting for ZoomRoom.cs and IHasParticipants.cs

feat(essentials): Adds IMobileControl3 interface to maintain backwards compatibility

PepperDashEssentials/ControlSystem.cs

@@ -484,7 +484,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is IEssentialsHuddleVtc1Room)
                     {
@@ -495,7 +495,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is EssentialsTechRoom)
                     {
@@ -507,7 +507,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else
                     {
@@ -524,13 +524,22 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void CreateMobileControlBridge(EssentialsRoomBase room)
+        private static void CreateMobileControlBridge(object room)
         {
             var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
+            var mobileControl3 = mobileControl as IMobileControl3;
+
+            if (mobileControl3 != null)
+            {
+                mobileControl3.CreateMobileControlRoomBridge(room as IEssentialsRoom, mobileControl);
+            }
+            else
+            {
+                mobileControl.CreateMobileControlRoomBridge(room as EssentialsRoomBase, mobileControl);
+            }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -1041,22 +1041,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-			if (codec != null)
-			{
-				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
-					true, 1300);
-				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
+		    if (codec == null)
+		    {
+		        return;
+		    }
 
-				if (codec.PhonebookSyncState.InitialSyncComplete)
-					SetCurrentDirectoryToRoot();
-				else
-				{
-					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
-				}
+		    DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
+		        true, 1300);
+		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
 
-			    RefreshDirectory();
-				
-			}
+		    if (codec.PhonebookSyncState.InitialSyncComplete)
+		        SetCurrentDirectoryToRoot();
+		    else
+		    {
+		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
+		    }
 		}
 
         /// <summary>
@@ -1064,11 +1063,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
+            var hasDirectory = Codec as IHasDirectory;
 
+            if (hasDirectory == null)
+            {
+                return;
+            }
+
+            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
-
-            RefreshDirectory();
         }
 
         /// <summary>
@@ -1080,10 +1083,17 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            SetCurrentDirectoryToRoot();
+            if (codec == null)
+            {
+                return;
+            }
 
-            RefreshDirectory();
-            
+            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+            {
+                return;
+            }
+
+            SetCurrentDirectoryToRoot();
         }
 
 		/// <summary>
@@ -1093,8 +1103,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-
-			RefreshDirectory();
+		    RefreshDirectory(e.Directory);
 		}
 
         /// <summary>
@@ -1123,16 +1132,27 @@ namespace PepperDash.Essentials.UIDrivers.VC
  
         }
 
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="dir"></param>
-		void RefreshDirectory()
+        /// <summary>
+        /// 
+        /// </summary>
+        void RefreshDirectory()
 		{
-            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
+		    var codec = Codec as IHasDirectory;
+
+		    if (codec == null)
+		    {
+		        return;
+		    }
+
+		    RefreshDirectory(codec.CurrentDirectoryResult);
+		}
+
+        void RefreshDirectory(CodecDirectory directory)
+        {
+            if (directory.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
+                foreach (var r in directory.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1152,19 +1172,33 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (!b)
+                                if (b)
                                 {
-                                    // Refresh the contact methods list
-                                    RefreshContactMethodsModalList(dc);
-                                    Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+                                    return;
                                 }
+                                // Refresh the contact methods list
+                                RefreshContactMethodsModalList(dc);
+                                Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
                             });
 
                         }
+                        else if (dc.ContactMethods.Count == 1)
+                        {
+                            var invitableContact = dc as IInvitableContact;
+
+                            if (invitableContact != null)
+                            {
+                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(invitableContact); });
+                            }
+                            else
+                            {
+                                // If only one contact method, just dial that method
+                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
+                            }
+                        }
                         else
                         {
-                            // If only one contact method, just dial that method
-							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
+                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
                         }
                     }
                     else    // is DirectoryFolder
@@ -1191,8 +1225,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
-
-		}
+        }
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -13,6 +13,14 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         void LinkSystemMonitorToAppServer();
     }
 
+    /// <summary>
+    /// Describes a MobileSystemController that accepts IEssentialsRoom
+    /// </summary>
+    public interface IMobileControl3 : IMobileControl
+    {
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+    }
+
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -69,6 +69,22 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("directoryResults")]
         public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
 
+        public List<DirectoryItem> Contacts
+        {
+            get
+            {
+                return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
+            }
+        }
+
+        public List<DirectoryItem> Folders
+        {
+            get
+            {
+                return CurrentDirectoryResults.OfType<DirectoryFolder>().Cast<DirectoryItem>().ToList();
+            }
+        }
+
         /// <summary>
         /// Used to store the ID of the current folder for CurrentDirectoryResults
         /// </summary>
@@ -104,6 +120,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             SortDirectory();
         }
 
+        /// <summary>
+        /// Filters the CurrentDirectoryResults by the predicate
+        /// </summary>
+        /// <param name="predicate"></param>
+        public void FilterContacts(Func<DirectoryItem, bool> predicate)
+        {
+            CurrentDirectoryResults = CurrentDirectoryResults.Where(predicate).ToList();
+        }
+
         /// <summary>
         /// Sorts the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
         /// </summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -1,100 +1,102 @@
 using System;
 using System.Collections.Generic;
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 {
-    /// <summary>
-    /// Describes a device that has call participants
-    /// </summary>
-    public interface IHasParticipants
-    {
-        CodecParticipants Participants { get; }
-    }
+	/// <summary>
+	/// Describes a device that has call participants
+	/// </summary>
+	public interface IHasParticipants
+	{
+		CodecParticipants Participants { get; }
+	}
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's video in a meeting
-    /// </summary>
-    public interface IHasParticipantVideoMute:IHasParticipants
-    {
-        void MuteVideoForParticipant(int userId);
-        void UnmuteVideoForParticipant(int userId);
-        void ToggleVideoForParticipant(int userId);
-    }
+	/// <summary>
+	/// Describes the ability to mute and unmute a participant's video in a meeting
+	/// </summary>
+	public interface IHasParticipantVideoMute : IHasParticipants
+	{
+		void MuteVideoForParticipant(int userId);
+		void UnmuteVideoForParticipant(int userId);
+		void ToggleVideoForParticipant(int userId);
+	}
 
-    /// <summary>
-    /// Describes the ability to mute and unmute a participant's audio in a meeting
-    /// </summary>
-    public interface IHasParticipantAudioMute : IHasParticipantVideoMute
-    {
-        void MuteAudioForParticipant(int userId);
-        void UnmuteAudioForParticipant(int userId);
-        void ToggleAudioForParticipant(int userId);
-    }
+	/// <summary>
+	/// Describes the ability to mute and unmute a participant's audio in a meeting
+	/// </summary>
+	public interface IHasParticipantAudioMute : IHasParticipantVideoMute
+	{
+		void MuteAudioForParticipant(int userId);
+		void UnmuteAudioForParticipant(int userId);
+		void ToggleAudioForParticipant(int userId);
+	}
 
-    /// <summary>
-    /// Describes the ability to pin and unpin a participant in a meeting
-    /// </summary>
-    public interface IHasParticipantPinUnpin : IHasParticipants
-    {
-        IntFeedback NumberOfScreensFeedback { get; }
-        int ScreenIndexToPinUserTo { get; }
+	/// <summary>
+	/// Describes the ability to pin and unpin a participant in a meeting
+	/// </summary>
+	public interface IHasParticipantPinUnpin : IHasParticipants
+	{
+		IntFeedback NumberOfScreensFeedback { get; }
+		int ScreenIndexToPinUserTo { get; }
 
-        void PinParticipant(int userId, int screenIndex);
-        void UnPinParticipant(int userId);
-        void ToggleParticipantPinState(int userId, int screenIndex);
-    }
+		void PinParticipant(int userId, int screenIndex);
+		void UnPinParticipant(int userId);
+		void ToggleParticipantPinState(int userId, int screenIndex);
+	}
 
-    public class CodecParticipants
-    {
-        private List<Participant> _currentParticipants;
- 
-        public List<Participant> CurrentParticipants {
-            get { return _currentParticipants; }
-            set
-            {
-                _currentParticipants = value;
-                OnParticipantsChanged();
-            }
-        }
+	public class CodecParticipants
+	{
+		private List<Participant> _currentParticipants;
 
-        public event EventHandler<EventArgs> ParticipantsListHasChanged;
+		public List<Participant> CurrentParticipants
+		{
+			get { return _currentParticipants; }
+			set
+			{
+				_currentParticipants = value;
+				OnParticipantsChanged();
+			}
+		}
 
-        public CodecParticipants()
-        {
-            _currentParticipants = new List<Participant>();
-        }
+		public event EventHandler<EventArgs> ParticipantsListHasChanged;
 
-        public void OnParticipantsChanged()
-        {
-            var handler = ParticipantsListHasChanged;
+		public CodecParticipants()
+		{
+			_currentParticipants = new List<Participant>();
+		}
 
-            if (handler == null) return;
+		public void OnParticipantsChanged()
+		{
+			var handler = ParticipantsListHasChanged;
 
-            handler(this, new EventArgs());
-        }
-    }
+			if (handler == null) return;
 
-    /// <summary>
-    /// Represents a call participant
-    /// </summary>
-    public class Participant
-    {
-        public int UserId { get; set; }
-        public bool IsHost { get; set; }
-        public string Name { get; set; }
-        public bool CanMuteVideo { get; set; }       
-        public bool CanUnmuteVideo { get; set; }
-        public bool VideoMuteFb { get; set; }
-        public bool AudioMuteFb { get; set; }
-        public bool HandIsRaisedFb { get; set; }
-        public bool IsPinnedFb { get; set; }
-        public int ScreenIndexIsPinnedToFb { get; set; }
+			handler(this, new EventArgs());
+		}
+	}
 
-        public Participant()
-        {
-            // Initialize to -1 (no screen)
-            ScreenIndexIsPinnedToFb = -1;
-        }
-    }
+	/// <summary>
+	/// Represents a call participant
+	/// </summary>
+	public class Participant
+	{
+		public int UserId { get; set; }
+		public bool IsHost { get; set; }
+		public string Name { get; set; }
+		public bool CanMuteVideo { get; set; }
+		public bool CanUnmuteVideo { get; set; }
+		public bool VideoMuteFb { get; set; }
+		public bool AudioMuteFb { get; set; }
+		public bool HandIsRaisedFb { get; set; }
+		public bool IsPinnedFb { get; set; }
+		public int ScreenIndexIsPinnedToFb { get; set; }
+
+		public Participant()
+		{
+			// Initialize to -1 (no screen)
+			ScreenIndexIsPinnedToFb = -1;
+		}
+	}
 }

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

@@ -276,6 +276,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				if (zoomRooms.Count > 0)
 				{
 					// If so, setup a rooms and contacts folder and add them.
+
+                    directory.ResultsFolderId = "root";
+
 					roomFolder.Name = "Rooms";
 					roomFolder.ParentFolderId = "root";
 					roomFolder.FolderId = "rooms";
@@ -292,22 +295,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-					if (zoomContacts.Count == 0) return directory;
+                    if (zoomContacts.Count == 0)
+                    {
+                        return directory;
+                    }
+					
+					foreach (Contact c in zoomContacts)
 					{
-						foreach (Contact c in zoomContacts)
+						var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
+
+                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
+
+						if (folders.Count > 0)
 						{
-							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
-
-							if (folders.Count > 0)
-							{
-								contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
-							}
-
-							contacts.Add(contact);
+							contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
 						}
 
-						directory.AddContactsToDirectory(contacts);
+						contacts.Add(contact);
 					}
+
+					directory.AddContactsToDirectory(contacts);
 				}
 				catch (Exception e)
 				{
@@ -1161,11 +1168,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 				set
 				{
-					if (value != _hideConfSelfVideo)
-					{
+					//if (value != _hideConfSelfVideo)
+					//{
 						_hideConfSelfVideo = value;
 						NotifyPropertyChanged("HideConfSelfVideo");
-					}
+					//}
 				}
 			}