pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-11 19:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved source selection workflow into separate class

Browse Source
This commit is contained in:
Heath Volmer
2017-02-15 10:50:04 -07:00
parent 23729f680c
commit 94626ca7d9
13 changed files with 216 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PepperDashEssentials/PepperDashEssentials.suo
View File

Binary file not shown.

BIN
PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo
View File

Binary file not shown.

107
PepperDashEssentials/PepperDashEssentials/UI Drivers/DualDisplayRouting.cs
View File

@@ -12,12 +12,26 @@ using PepperDash.Essentials.Core.PageManagers;
namespace PepperDash.Essentials
{
public class DualDisplayRouting : PanelDriverBase
public class DualDisplaySimpleOrAdvancedRouting : PanelDriverBase
{
EssentialsPresentationPanelAvFunctionsDriver Parent;
CTimer SourceSelectedTimer;
public DualDisplayRouting(BasicTriListWithSmartObject trilist) : base(trilist)
/// <summary>
/// Smart Object 3200
/// </summary>
SubpageReferenceList SourcesSrl;
bool IsSharingModeAdvanced;
public DualDisplaySimpleOrAdvancedRouting(EssentialsPresentationPanelAvFunctionsDriver parent) : base(parent.TriList)
{
Parent = parent;
SourcesSrl = new SubpageReferenceList(TriList, 3200, 3, 3, 3);
TriList.SetSigFalseAction(UIBoolJoin.ToggleSharingModePress, ToggleSharingModePressed);
TriList.SetSigFalseAction(UIBoolJoin.Display1AudioButtonPressAndFb, Display1AudioPress);
TriList.SetSigFalseAction(UIBoolJoin.Display1ControlButtonPress, Display1ControlPress);
TriList.SetSigTrueAction(UIBoolJoin.Display1SelectPress, Display1Press);
@@ -27,23 +41,102 @@ namespace PepperDash.Essentials
TriList.SetSigTrueAction(UIBoolJoin.Display2SelectPress, Display2Press);
}
public void Enable()
{
// attach to the source list SRL
}
/// <summary>
///
/// </summary>
public override void Show()
{
TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = true;
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
if(IsSharingModeAdvanced)
TriList.BooleanInput[UIBoolJoin.DualDisplayPageVisible].BoolValue = true;
else
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
base.Show();
}
/// <summary>
///
/// </summary>
public override void Hide()
{
TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false;
if(IsSharingModeAdvanced)
TriList.BooleanInput[UIBoolJoin.DualDisplayPageVisible].BoolValue = false;
else
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
base.Hide();
}
public void SetCurrentRoomFromParent()
{
if (IsSharingModeAdvanced)
return; // add stuff here
else
SetupSourcesForSimpleRouting();
}
/// <summary>
///
/// </summary>
void SetupSourcesForSimpleRouting()
{
// get the source list config and set up the source list
var config = ConfigReader.ConfigObject.SourceLists;
if (config.ContainsKey(Parent.CurrentRoom.SourceListKey))
{
var srcList = config[Parent.CurrentRoom.SourceListKey]
.Values.ToList().OrderBy(s => s.Order);
// Setup sources list
uint i = 1; // counter for UI list
foreach (var srcConfig in srcList)
{
if (!srcConfig.IncludeInSourceList) // Skip sources marked this way
continue;
var sourceKey = srcConfig.SourceKey;
var actualSource = DeviceManager.GetDeviceForKey(sourceKey) as Device;
if (actualSource == null)
{
Debug.Console(0, "Cannot assign missing source '{0}' to source UI list",
srcConfig.SourceKey);
continue;
}
var localSrcConfig = srcConfig; // lambda scope below
var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig,
b => { if (!b) UiSelectSource(localSrcConfig); });
SourcesSrl.AddItem(item); // add to the SRL
item.RegisterForSourceChange(Parent.CurrentRoom);
}
SourcesSrl.Count = (ushort)(i - 1);
}
}
/// <summary>
///
/// </summary>
void ToggleSharingModePressed()
{
Hide();
IsSharingModeAdvanced = !IsSharingModeAdvanced;
TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced;
Show();
}
/// <summary>
/// Called from button presses on source, where We can assume we want
/// to change to the proper screen.
/// </summary>
/// <param name="key">The key name of the route to run</param>
void UiSelectSource(SourceListItem sourceItem)
{
if (IsSharingModeAdvanced)
{
SourceListButtonPress(sourceItem);
}
else
Parent.CurrentRoom.DoSourceToAllDestinationsRoute(sourceItem);
}
public void SourceListButtonPress(SourceListItem item)
{

213
PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs
View File

@@ -105,7 +105,7 @@ namespace PepperDash.Essentials
/// <summary>
/// Driver that manages advanced sharing features
/// </summary>
DualDisplayRouting DualDisplayUiDriver;
DualDisplaySimpleOrAdvancedRouting DualDisplayUiDriver;
/// <summary>
/// All children attached to this driver. For hiding and showing as a group.
@@ -116,10 +116,10 @@ namespace PepperDash.Essentials
//// Important smart objects
/// <summary>
/// Smart Object 3200
/// </summary>
SubpageReferenceList SourcesSrl;
///// <summary>
///// Smart Object 3200
///// </summary>
//SubpageReferenceList SourcesSrl;
/// <summary>
/// Smart Object 15022
@@ -146,7 +146,7 @@ namespace PepperDash.Essentials
/// </summary>
CTimer PowerOffTimer;
bool IsSharingModeAdvanced;
//bool IsSharingModeAdvanced;
/// <summary>
/// Constructor
@@ -158,8 +158,10 @@ namespace PepperDash.Essentials
Config = config;
Parent = parent;
SourcesSrl = new SubpageReferenceList(TriList, 3200, 3, 3, 3);
//SourcesSrl = new SubpageReferenceList(TriList, 3200, 3, 3, 3);
ActivityFooterSrl = new SubpageReferenceList(TriList, 15022, 3, 3, 3);
DualDisplayUiDriver = new DualDisplaySimpleOrAdvancedRouting(this);
SetupActivityFooterWhenRoomOff();
ShowVolumeGauge = true;
@@ -241,8 +243,7 @@ namespace PepperDash.Essentials
TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = false;
//TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false;
VolumeButtonsPopupFeedback.ClearNow();
CancelPowerOff();
@@ -264,7 +265,7 @@ namespace PepperDash.Essentials
// show start page or staging...
if (CurrentRoom.OnFeedback.BoolValue)
{
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
//TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
}
@@ -288,58 +289,58 @@ namespace PepperDash.Essentials
TriList.BooleanInput[UIBoolJoin.TimeOnlyVisible].BoolValue = Config.ShowTime;
}
TriList.SetSigFalseAction(UIBoolJoin.ToggleSharingModePress, ToggleSharingModePressed);
//TriList.SetSigFalseAction(UIBoolJoin.ToggleSharingModePress, ToggleSharingModePressed);
ShowCurrentDisplayModeSigsInUse();
break;
}
}
/// <summary>
///
/// </summary>
void ToggleSharingModePressed()
{
HideSharingMode();
IsSharingModeAdvanced = !IsSharingModeAdvanced;
TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced;
RevealSharingMode();
}
///// <summary>
/////
///// </summary>
//void ToggleSharingModePressed()
//{
// HideSharingMode();
// IsSharingModeAdvanced = !IsSharingModeAdvanced;
// TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced;
// RevealSharingMode();
//}
/// <summary>
///
/// </summary>
void HideSharingMode()
{
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false;
if (IsSharingModeAdvanced)
{
if (DualDisplayUiDriver != null)
DualDisplayUiDriver.Hide();
}
else
{
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
}
}
///// <summary>
/////
///// </summary>
//void HideSharingMode()
//{
// TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false;
// if (IsSharingModeAdvanced)
// {
// if (DualDisplayUiDriver != null)
// DualDisplayUiDriver.Hide();
// }
// else
// {
// TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
// }
//}
/// <summary>
///
/// </summary>
void RevealSharingMode()
{
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
if (IsSharingModeAdvanced)
{
if(DualDisplayUiDriver == null)
DualDisplayUiDriver = new DualDisplayRouting(TriList);
DualDisplayUiDriver.Show();
}
else
{
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
}
}
///// <summary>
/////
///// </summary>
//void RevealSharingMode()
//{
// TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
// if (IsSharingModeAdvanced)
// {
// if(DualDisplayUiDriver == null)
// DualDisplayUiDriver = new DualDisplaySimpleOrAdvancedRouting(this);
// DualDisplayUiDriver.Show();
// }
// else
// {
// TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
// }
//}
/// <summary>
/// When the room is off, set the footer SRL
@@ -352,7 +353,7 @@ namespace PepperDash.Essentials
ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(2, ActivityFooterSrl, 1,
b => { }));
ActivityFooterSrl.Count = 2;
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 0;
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1;
}
/// <summary>
@@ -368,7 +369,7 @@ namespace PepperDash.Essentials
ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(3, ActivityFooterSrl,
3, b => { if (!b) PowerButtonPressed(); }));
ActivityFooterSrl.Count = 3;
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1;
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 2;
EndMeetingButtonSig = ActivityFooterSrl.BoolInputSig(2, 1);
}
@@ -382,8 +383,9 @@ namespace PepperDash.Essentials
{
ShareButtonSig.BoolValue = true;
TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = true;
RevealSharingMode();
DualDisplayUiDriver.Show();
//TriList.BooleanInput[UIBoolJoin.ToggleSharingModeVisible].BoolValue = true;
//RevealSharingMode();
}
}
@@ -408,7 +410,6 @@ namespace PepperDash.Essentials
CurrentInterlockedModalJoin = 0;
}
/// <summary>
/// Shows all sigs that are in CurrentDisplayModeSigsInUse
/// </summary>
@@ -482,20 +483,20 @@ namespace PepperDash.Essentials
}
}
/// <summary>
/// Called from button presses on source, where We can assume we want
/// to change to the proper screen.
/// </summary>
/// <param name="key">The key name of the route to run</param>
void UiSelectSource(SourceListItem sourceItem)
{
if (IsSharingModeAdvanced)
{
DualDisplayUiDriver.SourceListButtonPress(sourceItem);
}
else
CurrentRoom.DoSourceToAllDestinationsRoute(sourceItem);
}
///// <summary>
///// Called from button presses on source, where We can assume we want
///// to change to the proper screen.
///// </summary>
///// <param name="key">The key name of the route to run</param>
//void UiSelectSource(SourceListItem sourceItem)
//{
// if (IsSharingModeAdvanced)
// {
// DualDisplayUiDriver.SourceListButtonPress(sourceItem);
// }
// else
// CurrentRoom.DoSourceToAllDestinationsRoute(sourceItem);
//}
/// <summary>
///
@@ -615,7 +616,8 @@ namespace PepperDash.Essentials
if (_CurrentRoom != null)
{
SetupSourcesForSimpleRouting();
DualDisplayUiDriver.SetCurrentRoomFromParent();
//SetupSourcesForSimpleRouting();
TriList.StringInput[UIStringJoin.CurrentRoomName].StringValue = _CurrentRoom.Name;
// Link up all the change events from the room
@@ -646,43 +648,44 @@ namespace PepperDash.Essentials
}
else
{
DualDisplayUiDriver.Hide();
SetupActivityFooterWhenRoomOff();
TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true;
}
}
void SetupSourcesForSimpleRouting()
{
// get the source list config and set up the source list
var config = ConfigReader.ConfigObject.SourceLists;
if (config.ContainsKey(_CurrentRoom.SourceListKey))
{
var srcList = config[_CurrentRoom.SourceListKey]
.Values.ToList().OrderBy(s => s.Order);
// Setup sources list
uint i = 1; // counter for UI list
foreach (var srcConfig in srcList)
{
if (!srcConfig.IncludeInSourceList) // Skip sources marked this way
continue;
//void SetupSourcesForSimpleRouting()
//{
// // get the source list config and set up the source list
// var config = ConfigReader.ConfigObject.SourceLists;
// if (config.ContainsKey(_CurrentRoom.SourceListKey))
// {
// var srcList = config[_CurrentRoom.SourceListKey]
// .Values.ToList().OrderBy(s => s.Order);
// // Setup sources list
// uint i = 1; // counter for UI list
// foreach (var srcConfig in srcList)
// {
// if (!srcConfig.IncludeInSourceList) // Skip sources marked this way
// continue;
var sourceKey = srcConfig.SourceKey;
var actualSource = DeviceManager.GetDeviceForKey(sourceKey) as Device;
if (actualSource == null)
{
Debug.Console(0, "Cannot assign missing source '{0}' to source UI list",
srcConfig.SourceKey);
continue;
}
var localSrcConfig = srcConfig; // lambda scope below
var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig,
b => { if (!b) UiSelectSource(localSrcConfig); });
SourcesSrl.AddItem(item); // add to the SRL
item.RegisterForSourceChange(_CurrentRoom);
}
SourcesSrl.Count = (ushort)(i - 1);
}
}
// var sourceKey = srcConfig.SourceKey;
// var actualSource = DeviceManager.GetDeviceForKey(sourceKey) as Device;
// if (actualSource == null)
// {
// Debug.Console(0, "Cannot assign missing source '{0}' to source UI list",
// srcConfig.SourceKey);
// continue;
// }
// var localSrcConfig = srcConfig; // lambda scope below
// var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig,
// b => { if (!b) UiSelectSource(localSrcConfig); });
// SourcesSrl.AddItem(item); // add to the SRL
// item.RegisterForSourceChange(_CurrentRoom);
// }
// SourcesSrl.Count = (ushort)(i - 1);
// }
//}
/// <summary>
/// Hides source for provided source info

6
PepperDashEssentials/PepperDashEssentials/UI Drivers/enums and base.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Crestron.SimplSharpPro.DeviceSupport;
using PepperDash.Essentials.Core;
namespace PepperDash.Essentials
@@ -100,7 +100,7 @@ namespace PepperDash.Essentials
{
}
public PanelDriverBase(Crestron.SimplSharpPro.DeviceSupport.BasicTriListWithSmartObject triList)
public PanelDriverBase(BasicTriListWithSmartObject triList)
{
TriList = triList;
}
@@ -128,7 +128,7 @@ namespace PepperDash.Essentials
/// <summary>
/// The trilist object for the Crestron TP device
/// </summary>
public Crestron.SimplSharpPro.DeviceSupport.BasicTriListWithSmartObject TriList { get; private set; }
public BasicTriListWithSmartObject TriList { get; private set; }
/// <summary>
///

BIN
PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz
View File

Binary file not shown.

BIN
PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll
View File

Binary file not shown.

BIN
PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb
View File

Binary file not shown.

4
PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config
View File

@@ -10,8 +10,8 @@
<ArchiveName />
</RequiredInfo>
<OptionalInfo>
<CompiledOn>2/14/2017 11:24:21 AM</CompiledOn>
<CompilerRev>1.0.0.20529</CompilerRev>
<CompiledOn>2/15/2017 10:47:23 AM</CompiledOn>
<CompilerRev>1.0.0.19420</CompilerRev>
</OptionalInfo>
<Plugin>
<Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>

2
PepperDashEssentials/PepperDashEssentials/bin/manifest.info
View File

@@ -1,4 +1,4 @@
MainAssembly=PepperDashEssentials.dll:0ec9394c958b83119e9ba457828c9bd0
MainAssembly=PepperDashEssentials.dll:60c91f66dea9040efb0f42a2e016ea2d
MainAssemblyMinFirmwareVersion=1.009.0029
MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
ü

BIN
PepperDashEssentials/PepperDashEssentials/bin/manifest.ser
View File

Binary file not shown.

BIN
PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll
View File

Binary file not shown.

BIN
PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb
View File

Binary file not shown.