pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Progress on header call status label

Browse Source
This commit is contained in:
Neil Dorin
2017-10-13 13:13:04 -06:00
parent 41b42dbc8f
commit bff6d9e68d
4 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
View File

@@ -303,7 +303,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// <returns></returns> /// <returns></returns>
public override bool CustomActivate() 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(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(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); CrestronConsole.AddNewConsoleCommand(GetBookings, "GetCodecBookings", "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);

6
Essentials/PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs
View File

@@ -447,11 +447,11 @@ namespace PepperDash.Essentials
/// <summary> /// <summary>
/// 15024 /// 15024
/// </summary> /// </summary>
public const uint HeaderCallRightButtonVisible = 15024; public const uint HeaderCallStatusRightPositionVisible = 15024;
/// <summary> /// <summary>
/// 15025 /// 15025
/// </summary> /// </summary>
public const uint HeaderCallLeftButtonVisible = 15025; public const uint HeaderCallStatusLeftPositionVisible = 15025;
/// <summary> /// <summary>
/// 15026 /// 15026
/// </summary> /// </summary>
@@ -459,7 +459,7 @@ namespace PepperDash.Essentials
/// <summary>[- /// <summary>[-
/// 15027 /// 15027
/// </summary> /// </summary>
public const uint HeaderCallButtonPress = 15027; public const uint HeaderCallStatusButtonPress = 15027;
/// <summary> /// <summary>
/// 15028 The gear button in header /// 15028 The gear button in header
/// </summary> /// </summary>

6
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -66,6 +66,8 @@ namespace PepperDash.Essentials
public HeaderListButton HeaderCallButton { get; private set; } public HeaderListButton HeaderCallButton { get; private set; }
public HeaderListButton HeaderGearButton { get; private set; } public HeaderListButton HeaderGearButton { get; private set; }
StringFeedback HeaderCallLabelTextFeedback { get; private set; }
/// <summary> /// <summary>
/// The parent driver for this /// The parent driver for this
/// </summary> /// </summary>
@@ -961,6 +963,10 @@ namespace PepperDash.Essentials
blankBut.ClearIcon(); blankBut.ClearIcon();
blankBut.OutputSig.SetSigFalseAction(() => { }); blankBut.OutputSig.SetSigFalseAction(() => { });
} }
// Call Status Label/Button
//HeaderCallLabel = new S
} }
/// <summary> /// <summary>

94
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -508,6 +508,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
CurrentDirectoryResult = (Codec as IHasDirectory).DirectoryRoot; CurrentDirectoryResult = (Codec as IHasDirectory).DirectoryRoot;
SearchKeypadClear();
DirectoryBackButtonVisibleFeedback.FireUpdate(); DirectoryBackButtonVisibleFeedback.FireUpdate();
RefreshDirectory(); RefreshDirectory();
@@ -580,51 +582,60 @@ namespace PepperDash.Essentials.UIDrivers.VC
void RefreshDirectory() void RefreshDirectory()
{ {
Debug.Console(0, "****** RefreshDirectory!"); Debug.Console(0, "****** RefreshDirectory!");
if (CurrentDirectoryResult.DirectoryResults.Count > 0)
ushort i = 0; {
foreach (var r in CurrentDirectoryResult.DirectoryResults) ushort i = 0;
{ foreach (var r in CurrentDirectoryResult.DirectoryResults)
if (i == DirectoryList.MaxCount) {
{ 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 (!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 if (!b)
RefreshContactMethodsModalList(dc); {
Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible); // Refresh the contact methods list
} RefreshContactMethodsModalList(dc);
}); Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
}
});
} }
else // is DirectoryFolder else // is DirectoryFolder
{ {
DirectoryList.SetItemMainText(i, string.Format("[+] {0}", r.Name)); 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) void RefreshContactMethodsModalList(DirectoryContact contact)
@@ -907,7 +918,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
SearchStringFeedback.FireUpdate(); SearchStringFeedback.FireUpdate();
SearchStringKeypadCheckEnables(); SearchStringKeypadCheckEnables();
SetCurrentDirectoryToRoot(); if(CurrentDirectoryResult != (Codec as IHasDirectory).DirectoryRoot)
SetCurrentDirectoryToRoot();
} }
/// <summary> /// <summary>