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

resolves ecs-611 and all other known bugs from onsite testing at NYU

Browse Source
This commit is contained in:
Neil Dorin
2017-10-24 14:55:15 -06:00
parent dc36386c0d
commit 3d7fb1a804
7 changed files with 61 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -885,7 +885,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
private void GetPhonebookContacts() private void GetPhonebookContacts()
{ {
// Get Phonebook Folders (determine local/corporate from config, and set results limit) // Get Phonebook Folders (determine local/corporate from config, and set results limit)
SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact", PhonebookMode)); SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact Limit: {1}", PhonebookMode, PhonebookResultsLimit));
} }
/// <summary> /// <summary>
@@ -991,7 +991,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
} }
} }
public void SelectPresentationByConnector(int source) public void SelectPresentationSource(int source)
{ {
PresentationSource = source; PresentationSource = source;
@@ -1003,7 +1003,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// </summary> /// </summary>
public void SelectPresentationSource1() public void SelectPresentationSource1()
{ {
SelectPresentationByConnector(2); SelectPresentationSource(2);
} }
/// <summary> /// <summary>
@@ -1011,7 +1011,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// </summary> /// </summary>
public void SelectPresentationSource2() public void SelectPresentationSource2()
{ {
SelectPresentationByConnector(3); SelectPresentationSource(3);
} }
/// <summary> /// <summary>

5
Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -115,8 +115,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
OnCallStatusChange(call); OnCallStatusChange(call);
if (AutoShareContentWhileInCall)
StartSharing();
} }
/// <summary> /// <summary>
@@ -130,6 +128,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
var handler = CallStatusChange; var handler = CallStatusChange;
if (handler != null) if (handler != null)
handler(this, new CodecCallStatusItemChangeEventArgs(item)); handler(this, new CodecCallStatusItemChangeEventArgs(item));
if (AutoShareContentWhileInCall)
StartSharing();
} }
/// <summary> /// <summary>

11
Essentials/PepperDashEssentials/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs
View File

@@ -58,9 +58,13 @@ namespace PepperDash.Essentials.Fusion
var codecPowerOnAction = new Action<bool>(b => { if (!b) codec.StandbyDeactivate(); }); var codecPowerOnAction = new Action<bool>(b => { if (!b) codec.StandbyDeactivate(); });
var codecPowerOffAction = new Action<bool>(b => { if (!b) codec.StandbyActivate(); }); var codecPowerOffAction = new Action<bool>(b => { if (!b) codec.StandbyActivate(); });
// Map FusionRoom Attributes: // Map FusionRoom Attributes:
// Codec volume
var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
codecVolume.OutputSig.UserObject = new Action<ushort>(b => (codec as IBasicVolumeWithFeedback).SetVolume(b));
(codec as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(codecVolume.InputSig);
// In Call Status // In Call Status
CodecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly); CodecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
codec.CallStatusChange += new EventHandler<PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange); codec.CallStatusChange += new EventHandler<PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
@@ -331,11 +335,6 @@ namespace PepperDash.Essentials.Fusion
if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay) if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
{ {
// Display volume
var defaultDisplayVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
defaultDisplayVolume.OutputSig.UserObject = new Action<ushort>(b => (display as IBasicVolumeWithFeedback).SetVolume(b));
(display as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(defaultDisplayVolume.InputSig);
// Power on // Power on
var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig); var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); }); defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });

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

@@ -129,37 +129,17 @@ namespace PepperDash.Essentials
/// </summary> /// </summary>
public const uint VCSelfViewLayoutVisible = 1208; public const uint VCSelfViewLayoutVisible = 1208;
/// <summary> /// <summary>
/// 1211 /// 1211 - 1215
/// </summary> /// </summary>
public const uint VCFavorite1Press = 1211; public const uint VCFavoritePressStart = 1211;
// RANGE IN USE
public const uint VCFavoritePressEnd = 1215;
/// <summary> /// <summary>
/// 1212 /// 1221 - 1225
/// </summary> /// </summary>
public const uint VCFavorite2Press = 1212; public const uint VCFavoriteVisibleStart = 1221;
/// <summary> // RANGE IN USE
/// 1213 public const uint VCFavoriteVisibleEnd = 1225;
/// </summary>
public const uint VCFavorite3Press = 1213;
/// <summary>
/// 1214
/// </summary>
public const uint VCFavorite4Press = 1214;
/// <summary>
/// 1221
/// </summary>
public const uint VCFavorite1Visible = 1221;
/// <summary>
/// 1222
/// </summary>
public const uint VCFavorite2Visible = 1222;
/// <summary>
/// 1223
/// </summary>
public const uint VCFavorite3Visible = 1223;
/// <summary>
/// 1224
/// </summary>
public const uint VCFavorite4Visible = 1224;
/// <summary> /// <summary>
/// 1231 /// 1231
/// </summary> /// </summary>

28
Essentials/PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs
View File

@@ -51,32 +51,14 @@ namespace PepperDash.Essentials
/// </summary> /// </summary>
public const uint VCDirectoryListTextStart = 1301; public const uint VCDirectoryListTextStart = 1301;
// RANGE IN USE // RANGE IN USE
public const uint VCDirectoryListTextEnd = 1400; public const uint VCDirectoryListTextEnd = 1556;
/// <summary> /// <summary>
/// 141112 /// 1611 - 1615
/// </summary> /// </summary>
public const uint VCFavorites1Text = 1411; public const uint VCFavoritesStart = 1611;
// RANGE IN USE
/// <summary> public const uint VCFavoritesTextEnd = 1615;
/// 1412
/// </summary>
public const uint VCFavorites2Text = 1412;
/// <summary>
/// 1413
/// </summary>
public const uint VCFavorites3Text = 1413;
/// <summary>
/// 1414
/// </summary>
public const uint VCFavorites4Text = 1414;
/// <summary>
/// 1415
/// </summary>
public const uint VCFavorites5Text = 1415;
//****************************************************** //******************************************************

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

@@ -1327,7 +1327,7 @@ namespace PepperDash.Essentials
{ {
var routeInfo = CurrentRoom.CurrentSourceInfo; var routeInfo = CurrentRoom.CurrentSourceInfo;
// This will show off popup too // This will show off popup too
if (this.IsVisible) if (this.IsVisible && !VCDriver.IsVisible)
ShowCurrentSource(); ShowCurrentSource();
if (routeInfo == null)// || !CurrentRoom.OnFeedback.BoolValue) if (routeInfo == null)// || !CurrentRoom.OnFeedback.BoolValue)
@@ -1454,6 +1454,7 @@ namespace PepperDash.Essentials
{ {
PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; } PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
JoinedSigInterlock PopupInterlock { get; } JoinedSigInterlock PopupInterlock { get; }
EssentialsHuddleVtc1Room CurrentRoom { get; }
void ShowNotificationRibbon(string message, int timeout); void ShowNotificationRibbon(string message, int timeout);
void HideNotificationRibbon(); void HideNotificationRibbon();
void ComputeHeaderCallStatus(VideoCodecBase codec); void ComputeHeaderCallStatus(VideoCodecBase codec);

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

@@ -194,7 +194,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <param name="e"></param> /// <param name="e"></param>
void Codec_IsReady() void Codec_IsReady()
{ {
TriList.SetString(UIStringJoin.RoomPhoneText, GetFormattedDialString(Codec.CodecInfo.PhoneNumber)); TriList.SetString(UIStringJoin.RoomPhoneText, GetFormattedPhoneNumber(Codec.CodecInfo.PhoneNumber));
TriList.SetString(UIStringJoin.RoomSipText, Codec.CodecInfo.SipUri); TriList.SetString(UIStringJoin.RoomSipText, Codec.CodecInfo.SipUri);
if(Parent.HeaderButtonsAreSetUp) if(Parent.HeaderButtonsAreSetUp)
@@ -221,6 +221,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
Parent.ShowNotificationRibbon("Connected", 2000); Parent.ShowNotificationRibbon("Connected", 2000);
StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress); StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
ShowKeypad(); ShowKeypad();
(Parent.CurrentRoom.CurrentVolumeControls as IBasicVolumeWithFeedback).MuteOff();
//VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible); //VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
break; break;
case eCodecCallStatus.Connecting: case eCodecCallStatus.Connecting:
@@ -498,15 +499,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
if (i < favs.Count) if (i < favs.Count)
{ {
var fav = favs[(int)i]; var fav = favs[(int)i];
TriList.SetString(1411 + i, fav.Name); TriList.SetString(UIStringJoin.VCFavoritesStart + i, fav.Name);
TriList.SetBool(1221 + i, true); TriList.SetBool(UIBoolJoin.VCFavoriteVisibleStart + i, true);
TriList.SetSigFalseAction(1211 + i, () => TriList.SetSigFalseAction(UIBoolJoin.VCFavoritePressStart + i, () =>
{ {
Codec.Dial(fav.Number); Codec.Dial(fav.Number);
}); });
} }
else else
TriList.SetBool(1221 + i, false); TriList.SetBool(UIBoolJoin.VCFavoriteVisibleStart + i, false);
} }
} }
} }
@@ -1073,7 +1074,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <summary> /// <summary>
/// /// Returns the text value for the keypad dial entry field
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
string GetFormattedDialString(string ds) string GetFormattedDialString(string ds)
@@ -1082,21 +1083,33 @@ namespace PepperDash.Essentials.UIDrivers.VC
{ {
return "Tap for keyboard"; return "Tap for keyboard";
} }
if(Regex.Match(ds, @"^\d{4,7}$").Success) // 456-7890
return string.Format("{0}-{1}", ds.Substring(0, 3), ds.Substring(3)); return GetFormattedPhoneNumber(ds);
if (Regex.Match(ds, @"^9\d{4,7}$").Success) // 456-7890
return string.Format("9 {0}-{1}", ds.Substring(1, 3), ds.Substring(4)); }
if (Regex.Match(ds, @"^\d{8,10}$").Success) // 123-456-78
return string.Format("({0}) {1}-{2}", ds.Substring(0, 3), ds.Substring(3, 3), ds.Substring(6)); /// <summary>
if (Regex.Match(ds, @"^\d{10}$").Success) // 123-456-7890 full /// Formats a string of numbers as a North American phone number
return string.Format("({0}) {1}-{2}", ds.Substring(0, 3), ds.Substring(3, 3), ds.Substring(6)); /// </summary>
if (Regex.Match(ds, @"^1\d{10}$").Success) /// <param name="s"></param>
return string.Format("+1 ({0}) {1}-{2}", ds.Substring(1, 3), ds.Substring(4, 3), ds.Substring(7)); /// <returns></returns>
if (Regex.Match(ds, @"^9\d{10}$").Success) string GetFormattedPhoneNumber(string s)
return string.Format("9 ({0}) {1}-{2}", ds.Substring(1, 3), ds.Substring(4, 3), ds.Substring(7)); {
if (Regex.Match(ds, @"^91\d{10}$").Success) if (Regex.Match(s, @"^\d{4,7}$").Success) // 456-7890
return string.Format("9 +1 ({0}) {1}-{2}", ds.Substring(2, 3), ds.Substring(5, 3), ds.Substring(8)); return string.Format("{0}-{1}", s.Substring(0, 3), s.Substring(3));
return ds; if (Regex.Match(s, @"^9\d{4,7}$").Success) // 456-7890
return string.Format("9 {0}-{1}", s.Substring(1, 3), s.Substring(4));
if (Regex.Match(s, @"^\d{8,10}$").Success) // 123-456-78
return string.Format("({0}) {1}-{2}", s.Substring(0, 3), s.Substring(3, 3), s.Substring(6));
if (Regex.Match(s, @"^\d{10}$").Success) // 123-456-7890 full
return string.Format("({0}) {1}-{2}", s.Substring(0, 3), s.Substring(3, 3), s.Substring(6));
if (Regex.Match(s, @"^1\d{10}$").Success)
return string.Format("+1 ({0}) {1}-{2}", s.Substring(1, 3), s.Substring(4, 3), s.Substring(7));
if (Regex.Match(s, @"^9\d{10}$").Success)
return string.Format("9 ({0}) {1}-{2}", s.Substring(1, 3), s.Substring(4, 3), s.Substring(7));
if (Regex.Match(s, @"^91\d{10}$").Success)
return string.Format("9 +1 ({0}) {1}-{2}", s.Substring(2, 3), s.Substring(5, 3), s.Substring(8));
return s;
} }
enum eKeypadMode enum eKeypadMode