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

Bug fixing...

Browse Source
This commit is contained in:
Neil Dorin
2017-10-17 22:19:34 -06:00
parent f5626fcd8b
commit 08e528220c
16 changed files with 1740 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,25 +234,25 @@ namespace PepperDash.Essentials
var roomConf = CurrentRoom.Config;
if (Config.HeaderStyle == UiHeaderStyle.Habanero)
TriList.SetString(UIStringJoin.CurrentRoomName, CurrentRoom.Name);
if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Habanero)
{
TriList.SetString(UIStringJoin.CurrentRoomName, CurrentRoom.Name);
TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderPageVisible));
}
else if (Config.HeaderStyle == UiHeaderStyle.Verbose)
else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose)
{
// room name on join 1, concat phone and sip on join 2, no button method
TriList.SetString(UIStringJoin.CurrentRoomName, CurrentRoom.Name);
var addr = roomConf.Addresses;
if (addr == null) // protect from missing values by using default empties
addr = new EssentialsRoomAddressPropertiesConfig();
// empty string when either missing, pipe when both showing
TriList.SetString(UIStringJoin.RoomAddressPipeText,
(string.IsNullOrEmpty(addr.PhoneNumber.Trim())
|| string.IsNullOrEmpty(addr.SipAddress.Trim())) ? "" : " | ");
TriList.SetString(UIStringJoin.RoomPhoneText, addr.PhoneNumber);
TriList.SetString(UIStringJoin.RoomSipText, addr.SipAddress);
//var addr = roomConf.Addresses;
//if (addr == null) // protect from missing values by using default empties
// addr = new EssentialsRoomAddressPropertiesConfig();
//// empty string when either missing, pipe when both showing
//TriList.SetString(UIStringJoin.RoomAddressPipeText,
// (string.IsNullOrEmpty(addr.PhoneNumber.Trim())
// || string.IsNullOrEmpty(addr.SipAddress.Trim())) ? "" : " | ");
//TriList.SetString(UIStringJoin.RoomPhoneText, addr.PhoneNumber);
//TriList.SetString(UIStringJoin.RoomSipText, addr.SipAddress);
}
TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime);
@@ -621,16 +621,22 @@ namespace PepperDash.Essentials
/// </summary>
void ShowCurrentSource()
{
if (CurrentRoom.CurrentSourceInfo == null)
return;
if (CurrentRoom.CurrentSourceInfo == null)
return;
if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
{
TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
return;
}
var uiDev = CurrentRoom.CurrentSourceInfo.SourceDevice as IUiDisplayInfo;
PageManager pm = null;
// If we need a page manager, get an appropriate one
if (uiDev != null)
{
TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
// Got an existing page manager, get it
TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
// Got an existing page manager, get it
if (PageManagers.ContainsKey(uiDev))
pm = PageManagers[uiDev];
// Otherwise make an apporiate one
@@ -1195,12 +1201,12 @@ namespace PepperDash.Essentials
Parent.Show();
return;
}
else if (CurrentRoom.CurrentSourceInfo != null)
else if (routeInfo != null)
{
TriList.StringInput[UIStringJoin.CurrentSourceName].StringValue = routeInfo.PreferredName;
TriList.StringInput[UIStringJoin.CurrentSourceIcon].StringValue = routeInfo.Icon; // defaults to "blank"
}
else
else // This never gets hit???!!!
{
TriList.StringInput[UIStringJoin.CurrentSourceName].StringValue = "---";
TriList.StringInput[UIStringJoin.CurrentSourceIcon].StringValue = "Blank";

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

@@ -417,8 +417,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
TriList.SetString(textOffset + i, c.Name);
// if it's today, show a simpler string
string timeText = null;
if (c.StartTime.Date == DateTime.Now.Date)
if (c.StartTime.Date == DateTime.Now.Date)
timeText = c.StartTime.ToShortTimeString();
else if (c.StartTime == DateTime.MinValue)
timeText = "";
else
timeText = c.StartTime.ToString();
TriList.SetString(timeTextOffset + i, timeText);
@@ -678,10 +680,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// </summary>
void SetupSelfViewControls()
{
TriList.SetSigFalseAction(UIBoolJoin.VCStagingSelfViewLayoutPress, this.ShowSelfViewLayout);
var svc = Codec as IHasCodecSelfview;
if (svc != null)
{
// Default Selfview to off
svc.SelfviewModeOff();
TriList.SetSigFalseAction(UIBoolJoin.VCSelfViewTogglePress, svc.SelfviewModeToggle);
svc.SelfviewIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCSelfViewTogglePress]);