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

Fixed Stop Sharing button visible feedback on call list

Browse Source
This commit is contained in:
Neil Dorin
2017-10-22 12:39:57 -06:00
parent 3e39210cc0
commit 3897a41dd1
8 changed files with 152 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Essentials/PepperDashEssentials/ControlSystem.cs
View File

@@ -30,8 +30,8 @@ namespace PepperDash.Essentials
/// </summary>
public override void InitializeSystem()
{
CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Reloads configuration file",
ConsoleAccessLevelEnum.AccessOperator);
//CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Reloads configuration file",
// ConsoleAccessLevelEnum.AccessOperator);
//CrestronConsole.AddNewConsoleCommand(s => TearDown(), "ungo", "Unloads configuration file",
// ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(s =>
@@ -41,7 +41,7 @@ namespace PepperDash.Essentials
},
"listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
//GoWithLoad();
GoWithLoad();
}
/// <summary>

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

@@ -44,7 +44,7 @@ namespace PepperDash.Essentials
/// <summary>
/// 1005
/// </summary>
public const uint CallSharedSourceInfoEnable = 1005;
public const uint CallSharedSourceInfoVisible = 1005;
/// <summary>
/// 1006
/// </summary>
@@ -487,6 +487,10 @@ namespace PepperDash.Essentials
/// </summary>
public const uint HeaderCallStatusRightPositionVisible = 15025;
/// <summary>
/// 15027
/// </summary>
public const uint HeaderCallStatusLabelPress = 15027;
/// <summary>
/// 15028 The gear button in header
/// </summary>
public const uint FIXFIX_HeaderGearButtonPress_FIXFIX = 15028;

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

@@ -1076,6 +1076,9 @@ namespace PepperDash.Essentials
TriList.SetSigFalseAction(i, () => { });
}
TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, ShowActiveCallsList);
// Set Call Status Subpage Position
if (nextJoin == 3951)

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

@@ -112,8 +112,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(Codec_CallStatusChange);
codec.SharingSourceFeedback.OutputChange += new EventHandler<EventArgs>(SharingSourceFeedback_OutputChange);
// If the codec is ready, then get the values we want, otherwise wait
if (Codec.IsReady)
Codec_IsReady();
@@ -182,8 +180,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
TriList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
CallSharingInfoVisibleFeedback = new BoolFeedback(() => !string.IsNullOrEmpty(Codec.SharingSourceFeedback.StringValue));
CallSharingInfoVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.CallSharedSourceInfoEnable]);
CallSharingInfoVisibleFeedback = new BoolFeedback(() => Codec.SharingContentIsOnFeedback.BoolValue);
codec.SharingContentIsOnFeedback.OutputChange += new EventHandler<EventArgs>(SharingContentIsOnFeedback_OutputChange);
CallSharingInfoVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.CallSharedSourceInfoVisible]);
CallSharingInfoTextFeedback = new StringFeedback(() => GetCurrentSourceName(Codec.SharingSourceFeedback.StringValue));
CallSharingInfoTextFeedback.LinkInputSig(triList.StringInput[UIStringJoin.CallSharedSourceNameText]);
@@ -198,9 +197,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <returns></returns>
string GetCurrentSourceName(string key)
{
Debug.Console(1, "GetCurrentSource: Attempting to get device with key: {0}", key);
var device = DeviceManager.GetDeviceForKey(key);
return (device as SourceListItem).Name;
if (device != null)
return (device as SourceListItem).Name;
else
return "None";
}
/// <summary>
@@ -208,14 +212,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void SharingSourceFeedback_OutputChange(object sender, EventArgs e)
void SharingContentIsOnFeedback_OutputChange(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty((sender as IHasContentSharing).SharingSourceFeedback.StringValue))
{
// Source is being shared
}
CallSharingInfoVisibleFeedback.FireUpdate();
CallSharingInfoTextFeedback.FireUpdate();
}
/// <summary>