Merge branch 'development' into feature/visca-presets-fix

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -752,10 +752,10 @@ namespace PepperDash.Essentials
         /// 15044 Close button for source modal overlay
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
-        ///// <summary>
-        ///// 15045 - Visibility for the bar containing call navigation button list
-        ///// </summary>
-        //public const uint CallStagingBarVisible = 15045;
+        /// <summary>
+        /// 15045 - Visibility for the bar containing call navigation button list
+        /// </summary>
+        public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -173,28 +173,10 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
-
-        private UiDisplayMode _currentMode;
-
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
-        UiDisplayMode CurrentMode
-        {
-            get
-            {
-                return _currentMode;
-            }
-            set
-            {
-                if (value != _currentMode)
-                {
-                    _currentMode = value;
-
-                    SetActivityFooterFeedbacks();
-                }
-            }
-        }
+        UiDisplayMode CurrentMode = UiDisplayMode.Start;
 
 		CTimer NextMeetingTimer;
 
@@ -225,7 +207,6 @@ namespace PepperDash.Essentials
 
 			MeetingOrContactMethodModalSrl = new SubpageReferenceList(TriList, UISmartObjectJoin.MeetingListSRL, 3, 3, 5);
 
-            CurrentMode = UiDisplayMode.Start;
 
 			// buttons are added in SetCurrentRoom
 			//HeaderButtonsList = new SmartObjectHeaderButtonList(TriList.SmartObjects[UISmartObjectJoin.HeaderButtonList]);
@@ -626,21 +607,11 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            if (CurrentRoom != null)
-            {
-                var startMode = CurrentMode == UiDisplayMode.Start;
-                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
-                var callMode = CurrentMode == UiDisplayMode.Call;
-
-                TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
-                TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
-
-                CallButtonSig.BoolValue = callMode
-                    && CurrentRoom.ShutdownType == eShutdownType.None;
-                ShareButtonSig.BoolValue = presentationMode
-                    && CurrentRoom.ShutdownType == eShutdownType.None;
-                EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
-            }
+            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
+                && CurrentRoom.ShutdownType == eShutdownType.None;
+            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
+                && CurrentRoom.ShutdownType == eShutdownType.None;
+            EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
         }
 
         /// <summary>
@@ -652,13 +623,14 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            //TriList.SetBool(StartPageVisibleJoin, false);
-            //TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-            //TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
                 CurrentSourcePageManager.Hide();
 			PowerOnFromCall();
             CurrentMode = UiDisplayMode.Call;
+            SetActivityFooterFeedbacks();
             VCDriver.Show();
         }
 
@@ -671,6 +643,9 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
             // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
             { 
@@ -690,6 +665,7 @@ namespace PepperDash.Essentials
             }
             CurrentMode = UiDisplayMode.Presentation;
 			SetupSourceList();
+            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -731,8 +707,6 @@ namespace PepperDash.Essentials
 			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
-            CurrentMode = UiDisplayMode.Presentation;
-
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -1244,8 +1218,9 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                //TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                //TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
+                SetActivityFooterFeedbacks();
+                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
 				// Clear this so that the pesky meeting warning can resurface every minute when off
 				LastMeetingDismissedId = null;
             }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -1080,12 +1080,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            if (codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-            {
-                SetCurrentDirectoryToRoot();
+            SetCurrentDirectoryToRoot();
 
-                RefreshDirectory();
-            }
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -1163,23 +1161,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             });
 
                         }
-                        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
                         {
-                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
+                            // If only one contact method, just dial that method
+							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
                         }
                     }
                     else    // is DirectoryFolder

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs

@@ -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)

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraVisca.cs

@@ -170,6 +170,9 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 	    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
 	    {
 	        LinkCameraToApi(this, trilist, joinStart, joinMapKey, bridge);
+
+			//OnPresetsListHasChanged();
+
 	    }
 
 	    void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
@@ -525,6 +528,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 +549,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
             SavePreset(preset);
         }
 
+
         #endregion
 
         #region IHasCameraFocusControl Members

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

@@ -69,22 +69,6 @@ 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>
@@ -120,15 +104,6 @@ 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/ZoomRoom/ResponseObjects.cs

@@ -276,9 +276,6 @@ 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";
@@ -295,26 +292,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-                    if (zoomContacts.Count == 0)
-                    {
-                        return directory;
-                    }
-					
-					foreach (Contact c in zoomContacts)
+					if (zoomContacts.Count == 0) return directory;
 					{
-						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)
+						foreach (Contact c in zoomContacts)
 						{
-							contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
+							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
+
+							if (folders.Count > 0)
+							{
+								contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
+							}
+
+							contacts.Add(contact);
 						}
 
-						contacts.Add(contact);
+						directory.AddContactsToDirectory(contacts);
 					}
-
-					directory.AddContactsToDirectory(contacts);
 				}
 				catch (Exception e)
 				{

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

@@ -361,16 +361,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public CodecDirectory CurrentDirectoryResult
 		{
 			get { return _currentDirectoryResult; }
-            private set
-            {
-                _currentDirectoryResult = value;
-
-                Debug.Console(2, this, "CurrentDirectoryResult Updated.  ResultsFolderId: {0}", _currentDirectoryResult.ResultsFolderId);
-
-                CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
-
-                OnDirectoryResultReturned(_currentDirectoryResult);
-            }
 		}
 
 		public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
@@ -384,8 +374,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
 
 			DirectoryBrowseHistoryStack.Clear();
-			CurrentDirectoryResult = directoryResults;
+			_currentDirectoryResult = directoryResults;
 
+			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void GetDirectoryFolderContents(string folderId)
@@ -397,16 +388,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
 
-			CurrentDirectoryResult = directoryResults;
+			_currentDirectoryResult = directoryResults;
 
+			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void SetCurrentDirectoryToRoot()
 		{
 			DirectoryBrowseHistoryStack.Clear();
 
-            CurrentDirectoryResult = DirectoryRoot;
-        }
+			_currentDirectoryResult = DirectoryRoot;
+
+			OnDirectoryResultReturned(DirectoryRoot);
+		}
 
 		public void GetDirectoryParentFolderContents()
 		{
@@ -417,8 +411,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
-            CurrentDirectoryResult = currentDirectory;
-        }
+			_currentDirectoryResult = currentDirectory;
+
+			OnDirectoryResultReturned(currentDirectory);
+		}
 
 		public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
 
@@ -684,15 +680,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		private void SetUpDirectory()
 		{
-            DirectoryRoot = new CodecDirectory() { ResultsFolderId = "root" };
+			DirectoryRoot = new CodecDirectory();
 
-            CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => CurrentDirectoryResult.ResultsFolderId != "root");
-
-            CurrentDirectoryResult = DirectoryRoot;
+            _currentDirectoryResult = DirectoryRoot;
 
 			DirectoryBrowseHistory = new List<CodecDirectory>();
 			DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
 
+			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => _currentDirectoryResult != DirectoryRoot);
+
+			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 		}
 
 		private void SetUpRouting()
@@ -1066,30 +1063,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									}
 								case "phonebooklistresult":
 									{
-                                        //  This result will always be the complete contents of the directory and never
-                                        //  A subset of the results via a search
-
 										JsonConvert.PopulateObject(responseObj.ToString(), Status.Phonebook);
 
-                                        var directoryResults =
-                                            zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
-
 										if (!PhonebookSyncState.InitialSyncComplete)
 										{
 											PhonebookSyncState.InitialPhonebookFoldersReceived();
 											PhonebookSyncState.PhonebookRootEntriesReceived();
-											PhonebookSyncState.SetPhonebookHasFolders(true);
+											PhonebookSyncState.SetPhonebookHasFolders(false);
 											PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
 										}
 
-                                        if (directoryResults.ResultsFolderId != "root")
-                                        {
-                                            directoryResults.ResultsFolderId = "root";
-                                        }
+										var directoryResults =
+											zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
 
-                                        DirectoryRoot = directoryResults;
+										DirectoryRoot = directoryResults;
 
-										CurrentDirectoryResult = directoryResults;
+										_currentDirectoryResult = DirectoryRoot;
+
+										OnDirectoryResultReturned(directoryResults);
 
 										break;
 									}
@@ -1245,7 +1236,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 											{
 												Direction = eCodecCallDirection.Incoming,
 												Status = eCodecCallStatus.Ringing,
-												Type = eCodecCallType.Video,
+												Type = eCodecCallType.Unknown,
 												Name = incomingCall.callerName,
 												Id = incomingCall.callerJID
 											};
@@ -1598,10 +1589,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 						var newCall = new CodecActiveCallItem 
                         {
                             Name = Status.Call.Info.meeting_list_item.meetingName,
-                            Number = Status.Call.Info.meeting_id,
                             Id = Status.Call.Info.meeting_id,
-                            Status = newStatus,
-                            Type = eCodecCallType.Video,
+                            Status = newStatus 
                         };
 
 						ActiveCalls.Add(newCall);
@@ -2019,43 +2008,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="result"></param>
 		private void OnDirectoryResultReturned(CodecDirectory result)
 		{
-            try
-            {
-                Debug.Console(2, this, "OnDirectoryResultReturned");
+			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 
-                var directoryResult = new CodecDirectory();
-
-                // If result is Root, create a copy and filter out contacts whose parent folder is not root
-                if (!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-                {
-                    Debug.Console(2, this, "Filtering DirectoryRoot to remove contacts for display");
-
-                    directoryResult.ResultsFolderId = result.ResultsFolderId;
-                    directoryResult.AddFoldersToDirectory(result.Folders);
-                    directoryResult.AddContactsToDirectory(result.Contacts.Where((c) => c.ParentFolderId == result.ResultsFolderId).ToList());
-                }
-                else
-                {
-                    directoryResult = result;
-                }
-
-                Debug.Console(2, this, "Updating directoryResult. IsOnRoot: {0}", !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
-
-                // This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
-                var handler = DirectoryResultReturned;
-                if (handler != null)
-                {
-                    handler(this, new DirectoryEventArgs
-                    {
-                        Directory = directoryResult,
-                        DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
-                    });
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error: {0}", e);
-            }
+			// This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
+			var handler = DirectoryResultReturned;
+			if (handler != null)
+			{
+				handler(this, new DirectoryEventArgs
+				{
+					Directory = result,
+					DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
+				});
+			}
 
 			//PrintDirectory(result);
 		}