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

Updates to work out kinks

Browse Source
This commit is contained in:
Neil Dorin
2020-08-06 21:16:03 -06:00
parent 66c481e3dc
commit d6581cab2e
8 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
View File

@@ -184,6 +184,12 @@ namespace PepperDash.Essentials.Room.Config
[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")] [JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; } public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
public EssentialsRoomPropertiesConfig()
{
LogoLight = new EssentialsLogoPropertiesConfig();
LogoDark = new EssentialsLogoPropertiesConfig();
}
} }
public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig

5
PepperDashEssentials/UI/EssentialsTouchpanelController.cs
View File

@@ -224,6 +224,8 @@ namespace PepperDash.Essentials
var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey); var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
if (room is EssentialsHuddleSpaceRoom) if (room is EssentialsHuddleSpaceRoom)
{ {
// Screen Saver Driver
mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
// Header Driver // Header Driver
Debug.Console(0, panelController, "Adding header driver"); Debug.Console(0, panelController, "Adding header driver");
@@ -272,6 +274,9 @@ namespace PepperDash.Essentials
{ {
Debug.Console(0, panelController, "Adding huddle space VTC AV driver"); Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
// Screen Saver Driver
mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
// Header Driver // Header Driver
mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props); mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);

4
PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs
View File

@@ -621,7 +621,7 @@ namespace PepperDash.Essentials
/// <summary> /// <summary>
/// 15030 Visibility for room data popup /// 15030 Visibility for room data popup
/// </summary> /// </summary>
public const uint RoomHeaderPageVisible = 15030; public const uint RoomHeaderInfoPageVisible = 15030;
/// <summary> /// <summary>
/// 15031 /// 15031
/// </summary> /// </summary>
@@ -812,7 +812,7 @@ namespace PepperDash.Essentials
/// <summary> /// <summary>
/// 15093 /// 15093
/// </summary> /// </summary>
public const uint RoomHeaderMCPageVisible = 15093; public const uint RoomHeaderInfoMCPageVisible = 15093;
/// <summary> /// <summary>
/// 15094 /// 15094

4
PepperDashEssentials/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs
View File

@@ -26,7 +26,7 @@ namespace PepperDash.Essentials
public PanelDriverBase CurrentChildDriver { get; private set; } public PanelDriverBase CurrentChildDriver { get; private set; }
public ScreenSaverController ScreenSaverController { get; private set; } public ScreenSaverController ScreenSaverController { get; set; }
CrestronTouchpanelPropertiesConfig Config; CrestronTouchpanelPropertiesConfig Config;
@@ -85,7 +85,7 @@ namespace PepperDash.Essentials
{ {
CurrentChildDriver = null; CurrentChildDriver = null;
ShowSubDriver(AvDriver as PanelDriverBase); ShowSubDriver(AvDriver as PanelDriverBase);
base.Show(); base.Show();
} }
public override void Hide() public override void Hide()

29
PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
View File

@@ -232,26 +232,31 @@ namespace PepperDash.Essentials
{ {
if (CurrentRoom.IsMobileControlEnabled) if (CurrentRoom.IsMobileControlEnabled)
{ {
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderMCPageVisible); Debug.Console(1, "Showing Mobile Control Header Info");
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
} }
else else
{ {
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderPageVisible); Debug.Console(1, "Showing Non Mobile Control Header Info");
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
} }
}); });
} }
else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose) else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose)
{ {
// room name on join 1, concat phone and sip on join 2, no button method TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
//var addr = roomConf.Addresses; {
//if (addr == null) // protect from missing values by using default empties if (CurrentRoom.IsMobileControlEnabled)
// addr = new EssentialsRoomAddressPropertiesConfig(); {
//// empty string when either missing, pipe when both showing Debug.Console(1, "Showing Mobile Control Header Info");
//TriList.SetString(UIStringJoin.RoomAddressPipeText, PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
// (string.IsNullOrEmpty(addr.PhoneNumber.Trim()) }
// || string.IsNullOrEmpty(addr.SipAddress.Trim())) ? "" : " | "); else
//TriList.SetString(UIStringJoin.RoomPhoneText, addr.PhoneNumber); {
//TriList.SetString(UIStringJoin.RoomSipText, addr.SipAddress); Debug.Console(1, "Showing Non Mobile Control Header Info");
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
}
});
} }
TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime); TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime);

31
PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -245,26 +245,31 @@ namespace PepperDash.Essentials
{ {
if (CurrentRoom.IsMobileControlEnabled) if (CurrentRoom.IsMobileControlEnabled)
{ {
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderMCPageVisible); Debug.Console(1, "Showing Mobile Control Header Info");
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
} }
else else
{ {
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderPageVisible); Debug.Console(1, "Showing Non Mobile Control Header Info");
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
} }
}); });
} }
else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose) else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose)
{ {
// room name on join 1, concat phone and sip on join 2, no button method TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
//var addr = roomConf.Addresses; {
//if (addr == null) // protect from missing values by using default empties if (CurrentRoom.IsMobileControlEnabled)
// addr = new EssentialsRoomAddressPropertiesConfig(); {
//// empty string when either missing, pipe when both showing Debug.Console(1, "Showing Mobile Control Header Info");
//TriList.SetString(UIStringJoin.RoomAddressPipeText, PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
// (string.IsNullOrEmpty(addr.PhoneNumber.Trim()) }
// || string.IsNullOrEmpty(addr.SipAddress.Trim())) ? "" : " | "); else
//TriList.SetString(UIStringJoin.RoomPhoneText, addr.PhoneNumber); {
//TriList.SetString(UIStringJoin.RoomSipText, addr.SipAddress); Debug.Console(1, "Showing Non Mobile Control Header Info");
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
}
});
} }
TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime); TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime);
@@ -353,7 +358,7 @@ namespace PepperDash.Essentials
TriList.SetBool(UIBoolJoin.LogoDefaultVisible, false); TriList.SetBool(UIBoolJoin.LogoDefaultVisible, false);
TriList.SetBool(UIBoolJoin.LogoUrlVisible, true); TriList.SetBool(UIBoolJoin.LogoUrlVisible, true);
TriList.SetString(UIStringJoin.LogoUrlLightBkgnd, _CurrentRoom.LogoUrlLightBkgnd); TriList.SetString(UIStringJoin.LogoUrlLightBkgnd, _CurrentRoom.LogoUrlLightBkgnd);
TriList.SetString(UIStringJoin.LogoUrlLightBkgnd, _CurrentRoom.LogoUrlDarkBkgnd); TriList.SetString(UIStringJoin.LogoUrlDarkBkgnd, _CurrentRoom.LogoUrlDarkBkgnd);
} }
} }

2
PepperDashEssentials/UIDrivers/ScreenSaverController.cs
View File

@@ -31,6 +31,8 @@ namespace PepperDash.Essentials
PositionJoins = new List<uint>() PositionJoins = new List<uint>()
{ UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible }; { UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible };
CrestronConsole.AddNewConsoleCommand((o) => Show(), "showscreensaver", "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
} }
public override void Show() public override void Show()

27
PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -192,17 +192,30 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <param name="e"></param> /// <param name="e"></param>
void Codec_IsReady() void Codec_IsReady()
{ {
string roomNumberSipUri = ""; string roomContactNumbers = "";
string roomPhoneNumber = "";
if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider
roomNumberSipUri = string.Format("{0} | {1}", GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber), Codec.CodecInfo.SipUri); {
roomContactNumbers = string.Format("{0} | {1}", GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber), Codec.CodecInfo.SipUri);
roomPhoneNumber = GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber);
}
else // If only one value present, just show the phone number else // If only one value present, just show the phone number
roomNumberSipUri = Codec.CodecInfo.SipPhoneNumber; {
roomPhoneNumber = GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber);
roomContactNumbers = Codec.CodecInfo.SipPhoneNumber;
}
if(string.IsNullOrEmpty(roomNumberSipUri)) if (string.IsNullOrEmpty(roomContactNumbers))
roomNumberSipUri = string.Format("{0} | {1}", Codec.CodecInfo.E164Alias, Codec.CodecInfo.H323Id); {
if(!string.IsNullOrEmpty(Codec.CodecInfo.E164Alias))
TriList.SetString(UIStringJoin.RoomPhoneText, roomNumberSipUri); roomContactNumbers = string.Format("{0} | {1}", Codec.CodecInfo.E164Alias, Codec.CodecInfo.H323Id);
else
roomContactNumbers = Codec.CodecInfo.H323Id;
}
TriList.SetString(UIStringJoin.RoomAddressPipeText, roomContactNumbers);
TriList.SetString(UIStringJoin.RoomPhoneText, roomPhoneNumber);
TriList.SetString(UIStringJoin.RoomVideoAddressText, Codec.CodecInfo.H323Id);
if(HeaderDriver.HeaderButtonsAreSetUp) if(HeaderDriver.HeaderButtonsAreSetUp)
HeaderDriver.ComputeHeaderCallStatus(Codec); HeaderDriver.ComputeHeaderCallStatus(Codec);