pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-10 02:05:08 +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

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

@@ -1327,7 +1327,7 @@ namespace PepperDash.Essentials
{
var routeInfo = CurrentRoom.CurrentSourceInfo;
// This will show off popup too
if (this.IsVisible)
if (this.IsVisible && !VCDriver.IsVisible)
ShowCurrentSource();
if (routeInfo == null)// || !CurrentRoom.OnFeedback.BoolValue)
@@ -1454,6 +1454,7 @@ namespace PepperDash.Essentials
{
PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
JoinedSigInterlock PopupInterlock { get; }
EssentialsHuddleVtc1Room CurrentRoom { get; }
void ShowNotificationRibbon(string message, int timeout);
void HideNotificationRibbon();
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>
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);
if(Parent.HeaderButtonsAreSetUp)
@@ -221,6 +221,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
Parent.ShowNotificationRibbon("Connected", 2000);
StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
ShowKeypad();
(Parent.CurrentRoom.CurrentVolumeControls as IBasicVolumeWithFeedback).MuteOff();
//VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
break;
case eCodecCallStatus.Connecting:
@@ -498,15 +499,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
if (i < favs.Count)
{
var fav = favs[(int)i];
TriList.SetString(1411 + i, fav.Name);
TriList.SetBool(1221 + i, true);
TriList.SetSigFalseAction(1211 + i, () =>
TriList.SetString(UIStringJoin.VCFavoritesStart + i, fav.Name);
TriList.SetBool(UIBoolJoin.VCFavoriteVisibleStart + i, true);
TriList.SetSigFalseAction(UIBoolJoin.VCFavoritePressStart + i, () =>
{
Codec.Dial(fav.Number);
});
}
else
TriList.SetBool(1221 + i, false);
TriList.SetBool(UIBoolJoin.VCFavoriteVisibleStart + i, false);
}
}
}
@@ -1073,7 +1074,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <summary>
///
/// Returns the text value for the keypad dial entry field
/// </summary>
/// <returns></returns>
string GetFormattedDialString(string ds)
@@ -1082,21 +1083,33 @@ namespace PepperDash.Essentials.UIDrivers.VC
{
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));
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));
if (Regex.Match(ds, @"^\d{10}$").Success) // 123-456-7890 full
return string.Format("({0}) {1}-{2}", ds.Substring(0, 3), ds.Substring(3, 3), ds.Substring(6));
if (Regex.Match(ds, @"^1\d{10}$").Success)
return string.Format("+1 ({0}) {1}-{2}", ds.Substring(1, 3), ds.Substring(4, 3), ds.Substring(7));
if (Regex.Match(ds, @"^9\d{10}$").Success)
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)
return string.Format("9 +1 ({0}) {1}-{2}", ds.Substring(2, 3), ds.Substring(5, 3), ds.Substring(8));
return ds;
return GetFormattedPhoneNumber(ds);
}
/// <summary>
/// Formats a string of numbers as a North American phone number
/// </summary>
/// <param name="s"></param>
/// <returns></returns>
string GetFormattedPhoneNumber(string s)
{
if (Regex.Match(s, @"^\d{4,7}$").Success) // 456-7890
return string.Format("{0}-{1}", s.Substring(0, 3), s.Substring(3));
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