From bff6d9e68dce542dcfa5de7db88101fec7be31a6 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 13 Oct 2017 13:13:04 -0600 Subject: [PATCH] Progress on header call status label --- .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs | 2 +- .../UI/JoinConstants/UIBoolJoin.cs | 6 +- ...entialsHuddleVtc1PanelAvFunctionsDriver.cs | 6 ++ .../VC/EssentialsVideoCodecUiDriver.cs | 94 +++++++++++-------- 4 files changed, 63 insertions(+), 45 deletions(-) diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs index d43ca5f7..e63121d4 100644 --- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs +++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs @@ -303,7 +303,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco /// public override bool CustomActivate() { - CrestronConsole.AddNewConsoleCommand(SendText, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator); + //CrestronConsole.AddNewConsoleCommand(SendText, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCodecCommDebug", "0 for Off, 1 for on", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(GetPhonebook, "GetCodecPhonebook", "Triggers a refresh of the codec phonebook", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(GetBookings, "GetCodecBookings", "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator); diff --git a/Essentials/PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs b/Essentials/PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs index 3a383381..387ceb84 100644 --- a/Essentials/PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs +++ b/Essentials/PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs @@ -447,11 +447,11 @@ namespace PepperDash.Essentials /// /// 15024 /// - public const uint HeaderCallRightButtonVisible = 15024; + public const uint HeaderCallStatusRightPositionVisible = 15024; /// /// 15025 /// - public const uint HeaderCallLeftButtonVisible = 15025; + public const uint HeaderCallStatusLeftPositionVisible = 15025; /// /// 15026 /// @@ -459,7 +459,7 @@ namespace PepperDash.Essentials /// [- /// 15027 /// - public const uint HeaderCallButtonPress = 15027; + public const uint HeaderCallStatusButtonPress = 15027; /// /// 15028 The gear button in header /// diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs index 6dfd7ed8..f82c117f 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs @@ -66,6 +66,8 @@ namespace PepperDash.Essentials public HeaderListButton HeaderCallButton { get; private set; } public HeaderListButton HeaderGearButton { get; private set; } + StringFeedback HeaderCallLabelTextFeedback { get; private set; } + /// /// The parent driver for this /// @@ -961,6 +963,10 @@ namespace PepperDash.Essentials blankBut.ClearIcon(); blankBut.OutputSig.SetSigFalseAction(() => { }); } + + // Call Status Label/Button + + //HeaderCallLabel = new S } /// diff --git a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs index 9f236f3e..283b3764 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs @@ -508,6 +508,8 @@ namespace PepperDash.Essentials.UIDrivers.VC CurrentDirectoryResult = (Codec as IHasDirectory).DirectoryRoot; + SearchKeypadClear(); + DirectoryBackButtonVisibleFeedback.FireUpdate(); RefreshDirectory(); @@ -580,51 +582,60 @@ namespace PepperDash.Essentials.UIDrivers.VC void RefreshDirectory() { Debug.Console(0, "****** RefreshDirectory!"); - - ushort i = 0; - foreach (var r in CurrentDirectoryResult.DirectoryResults) - { - if (i == DirectoryList.MaxCount) - { - break; - } - - i++; - - if(r is DirectoryContact) - { - DirectoryList.SetItemMainText(i, r.Name); - - var dc = r as DirectoryContact; - - DirectoryList.SetItemButtonAction(i, b => + if (CurrentDirectoryResult.DirectoryResults.Count > 0) + { + ushort i = 0; + foreach (var r in CurrentDirectoryResult.DirectoryResults) + { + if (i == DirectoryList.MaxCount) { - if (!b) + break; + } + + i++; + + if (r is DirectoryContact) + { + DirectoryList.SetItemMainText(i, r.Name); + + var dc = r as DirectoryContact; + + DirectoryList.SetItemButtonAction(i, b => { - // Refresh the contact methods list - RefreshContactMethodsModalList(dc); - Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible); - } - }); + if (!b) + { + // Refresh the contact methods list + RefreshContactMethodsModalList(dc); + Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible); + } + }); - } - else // is DirectoryFolder - { - DirectoryList.SetItemMainText(i, string.Format("[+] {0}", r.Name)); + } + else // is DirectoryFolder + { + DirectoryList.SetItemMainText(i, string.Format("[+] {0}", r.Name)); - var df = r as DirectoryFolder; + var df = r as DirectoryFolder; + + DirectoryList.SetItemButtonAction(i, b => + { + if (!b) + { + GetDirectoryFolderContents(df); + // will later call event handler after folder contents retrieved + } + }); + } + } + DirectoryList.Count = i; + } + else // No results in directory, display message to user + { + DirectoryList.Count = 1; + + DirectoryList.SetItemMainText(1, "No Results Found"); + } - DirectoryList.SetItemButtonAction(i, b => - { - if (!b) - { - GetDirectoryFolderContents(df); - // will later call event handler after folder contents retrieved - } - }); - } - } - DirectoryList.Count = i; } void RefreshContactMethodsModalList(DirectoryContact contact) @@ -907,7 +918,8 @@ namespace PepperDash.Essentials.UIDrivers.VC SearchStringFeedback.FireUpdate(); SearchStringKeypadCheckEnables(); - SetCurrentDirectoryToRoot(); + if(CurrentDirectoryResult != (Codec as IHasDirectory).DirectoryRoot) + SetCurrentDirectoryToRoot(); } ///