Merge 538f81c18e into 002cc07b52

Merge branch 'development' into hotfix/IMobileControl3
feat(essentials): Adds IMobileControl3 interface to maintain backwards compatibility
2026-02-18 06:04:56 +00:00 · 2021-08-16 21:16:46 +00:00 · 2021-08-16 15:16:44 -06:00 · 2021-08-16 14:27:28 -06:00 · 2021-08-16 12:43:28 -06:00 · 2021-08-16 11:52:35 -06:00
5 changed files with 114 additions and 54 deletions
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -483,7 +483,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)
                    {
@@ -494,7 +494,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)
                    {
@@ -506,7 +506,7 @@ namespace PepperDash.Essentials

                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");

-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                    }
                    else
                    {
@@ -527,13 +527,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...");
        }
--- a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/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,12 +1083,17 @@ namespace PepperDash.Essentials.UIDrivers.VC
        {
            var codec = Codec as IHasDirectory;

-            if (codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+            if (codec == null)
            {
-                SetCurrentDirectoryToRoot();
-
-                RefreshDirectory();
+                return;
            }
+
+            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+            {
+                return;
+            }
+
+            SetCurrentDirectoryToRoot();
        }

 		/// <summary>
@@ -1095,8 +1103,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-
-			RefreshDirectory();
+		    RefreshDirectory(e.Directory);
 		}

        /// <summary>
@@ -1125,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)
                    {
@@ -1154,12 +1172,13 @@ 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);
                            });

                        }
@@ -1206,8 +1225,7 @@ namespace PepperDash.Essentials.UIDrivers.VC

                DirectoryList.SetItemMainText(1, "No Results Found");
            }
-
-		}
+        }

        void RefreshContactMethodsModalList(DirectoryContact contact)
        {
--- a/Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs
+++ b/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>
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -216,21 +216,11 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                var presetsCamera = cameraDevice as IHasCameraPresets;
                presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>((o, a) =>
                {
-                    for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
-                    {
-                        int tempNum = i - 1;
-
-                        string label = "";
-
-                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
-
-                        if (preset != null)
-                            label = preset.Description;
-
-                        trilist.SetString((ushort) (joinMap.PresetLabelStart.JoinNumber + tempNum), label);
-                    }
+                    SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
                });

+                SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
+
                for (int i = 0; i < joinMap.NumberOfPresets.JoinNumber; i++)
                {
                    int tempNum = i;
@@ -246,10 +236,35 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
                        presetsCamera.PresetStore(tempNum, label);
                    });
                }
+                trilist.OnlineStatusChange += (sender, args) =>
+                {
+                    if (!args.DeviceOnLine)
+                    { return; }
+
+                    SendCameraPresetNamesToApi(presetsCamera, joinMap, trilist);
+                };
+
+            }
+        }
+        private void SendCameraPresetNamesToApi(IHasCameraPresets presetsCamera, CameraControllerJoinMap joinMap, BasicTriList trilist)
+        {
+            for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
+            {
+                int tempNum = i - 1;
+
+                string label = "";
+
+                var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
+
+                if (preset != null)
+                    label = preset.Description;
+
+                trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
            }
        }
 	}

+
    public class CameraPreset : PresetBase
    {
        public CameraPreset(int id, string description, bool isDefined, bool isDefinable)
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -525,6 +525,15 @@ namespace PepperDash.Essentials.Devices.Common.Cameras

        public event EventHandler<EventArgs> PresetsListHasChanged;

+		protected void OnPresetsListHasChanged()
+		{
+			var handler = PresetsListHasChanged;
+			if (handler == null)
+				return;
+
+			handler.Invoke(this, EventArgs.Empty);
+		}
+
        public List<CameraPreset> Presets { get; private set; }

        public void PresetSelect(int preset)
@@ -537,6 +546,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
            SavePreset(preset);
        }

+
        #endregion

        #region IHasCameraFocusControl Members
Author	SHA1	Message	Date
Neil Dorin	fbec8781fb	Merge `538f81c18e` into `002cc07b52`	2021-08-16 21:16:46 +00:00
Andrew Welker	538f81c18e	Merge branch 'development' into hotfix/IMobileControl3	2021-08-16 15:16:44 -06:00
Neil Dorin	01b713e6e1	feat(essentials): Adds IMobileControl3 interface to maintain backwards compatibility	2021-08-16 14:27:28 -06:00
Neil Dorin	002cc07b52	Merge pull request #784 from PepperDash/hotfix/UI-codec-directory-fixes Hotfix/UI codec directory fixes	2021-08-16 12:43:28 -06:00
Neil Dorin	16f993852c	Merge branch 'development' into hotfix/UI-codec-directory-fixes	2021-08-16 11:52:35 -06:00
Neil Dorin	ffd0fbc57b	Merge pull request #783 from PepperDash/hotfix/UI-codec-directory-fixes refactor: Add RefreshDirectory overload	2021-08-16 11:47:52 -06:00
Neil Dorin	9ac1d77c2a	Merge pull request #777 from PepperDash/feature/visca-presets-fix Feature/visca presets fix	2021-08-16 11:47:35 -06:00
Neil Dorin	2dd0c53a08	Merge branch 'development' into feature/visca-presets-fix	2021-08-16 11:35:13 -06:00
Andrew Welker	fab1219146	Merge pull request #780 from PepperDash/hotfix/zoomroom-fixes Hotfix/zoomroom fixes	2021-08-16 11:22:48 -06:00
Andrew Welker	23e8280904	refactor: Add RefreshDirectory overload This allows the directory to be refreshed by the event that updates the directory correctly	2021-08-16 09:42:11 -06:00
Andrew Welker	6708be0d15	Merge pull request #779 from PepperDash/hotfix/zoomroom-fixes Hotfix/zoomroom fixes	2021-08-16 08:22:19 -06:00
Louis Iacovelli	c26d7d73f8	Removed commented line.	2021-08-12 15:14:23 -04:00
Andrew Welker	854a0691d3	Merge branch 'development' into feature/visca-presets-fix	2021-08-12 12:12:31 -06:00
Louis Iacovelli	072411e4f6	Added method to set preset for multiple situations	2021-08-12 11:49:59 -04:00
Jason T Alborough	6f0bfedac1	Merge branch 'main' into feature/visca-presets-fix	2021-08-11 13:31:06 -04:00
Jason Alborough	71881addab	fix(Devices.Common.Cameras.CameraVisca): add and fire the event OnPresetsListHasChanged() after LinkToApi so that the camera presets populate to the bridge correctly	2021-08-11 13:00:51 -04:00