mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-14 12:15:01 +00:00
Cleaning up debug messages
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyTitle("PepperDashEssentials")]
|
[assembly: AssemblyTitle("PepperDashEssentials")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("PepperDash Technology Corp")]
|
||||||
[assembly: AssemblyProduct("PepperDashEssentials")]
|
[assembly: AssemblyProduct("PepperDashEssentials")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2015")]
|
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
|
||||||
[assembly: AssemblyVersion("1.0.0.*")]
|
[assembly: AssemblyVersion("1.0.1.*")]
|
||||||
|
|
||||||
|
|||||||
@@ -185,18 +185,11 @@ namespace PepperDash.Essentials
|
|||||||
|
|
||||||
CTimer NextMeetingTimer;
|
CTimer NextMeetingTimer;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Tracks whether the user dismissed the meeting popup, while the system was on. Always false when
|
|
||||||
/// system is off.
|
|
||||||
/// </summary>
|
|
||||||
bool NextMeetingWarningWasDismissed;
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Tracks the last meeting that was cancelled
|
/// Tracks the last meeting that was cancelled
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Meeting LastMeetingDismissed;
|
Meeting LastMeetingDismissed;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructor
|
/// Constructor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -439,9 +432,6 @@ namespace PepperDash.Essentials
|
|||||||
// Every 60 seconds, check meetings list for the closest, joinable meeting
|
// Every 60 seconds, check meetings list for the closest, joinable meeting
|
||||||
var ss = CurrentRoom.ScheduleSource;
|
var ss = CurrentRoom.ScheduleSource;
|
||||||
var meetings = ss.CodecSchedule.Meetings;
|
var meetings = ss.CodecSchedule.Meetings;
|
||||||
Debug.Console(0, "***** Checking meetings *****");
|
|
||||||
foreach (var m in meetings)
|
|
||||||
Debug.Console(0, "****** {0} {1} ******", m.StartTime.ToShortTimeString(), m.Joinable);
|
|
||||||
|
|
||||||
if (meetings.Count > 0)
|
if (meetings.Count > 0)
|
||||||
{
|
{
|
||||||
@@ -453,16 +443,13 @@ namespace PepperDash.Essentials
|
|||||||
|
|
||||||
if (CurrentRoom.OnFeedback.BoolValue
|
if (CurrentRoom.OnFeedback.BoolValue
|
||||||
&& LastMeetingDismissed == meeting)
|
&& LastMeetingDismissed == meeting)
|
||||||
//|| (LastMeetingDismissed != null && !LastMeetingDismissed.Joinable)))
|
|
||||||
{
|
{
|
||||||
Debug.Console(0, "****** Ignoring previously cancelled meeting warning ******");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
LastMeetingDismissed = null;
|
LastMeetingDismissed = null;
|
||||||
if (meeting != null)
|
if (meeting != null)
|
||||||
{
|
{
|
||||||
Debug.Console(0, "***** First joinable meeting: {0} {1}", meeting.StartTime.ToShortTimeString(), meeting.Joinable);
|
|
||||||
TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
|
TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
|
||||||
TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
|
TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
|
||||||
TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
|
TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
|
||||||
@@ -980,20 +967,6 @@ namespace PepperDash.Essentials
|
|||||||
TriList.SetSigFalseAction(UIBoolJoin.TechExitButton, () =>
|
TriList.SetSigFalseAction(UIBoolJoin.TechExitButton, () =>
|
||||||
PopupInterlock.HideAndClear());
|
PopupInterlock.HideAndClear());
|
||||||
|
|
||||||
//HeaderGearButton = new HeaderListButton(HeaderButtonsList, 5);
|
|
||||||
//HeaderGearButton.SetIcon(HeaderListButton.Gear);
|
|
||||||
//HeaderGearButton.OutputSig.SetSigHeldAction(2000,
|
|
||||||
// ShowTech,
|
|
||||||
// null,
|
|
||||||
// () =>
|
|
||||||
// {
|
|
||||||
// if (CurrentRoom.OnFeedback.BoolValue)
|
|
||||||
// PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.VolumesPageVisible);
|
|
||||||
// else
|
|
||||||
// PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.VolumesPagePowerOffVisible);
|
|
||||||
// });
|
|
||||||
|
|
||||||
|
|
||||||
// Help button and popup
|
// Help button and popup
|
||||||
if (CurrentRoom.Config.Help != null)
|
if (CurrentRoom.Config.Help != null)
|
||||||
{
|
{
|
||||||
@@ -1025,36 +998,11 @@ namespace PepperDash.Essentials
|
|||||||
//TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
|
//TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
|
||||||
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
|
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
|
||||||
});
|
});
|
||||||
//var helpButton = new HeaderListButton(HeaderButtonsList, 4);
|
|
||||||
//helpButton.SetIcon(HeaderListButton.Help);
|
|
||||||
//helpButton.OutputSig.SetSigFalseAction(() =>
|
|
||||||
//{
|
|
||||||
// string message = null;
|
|
||||||
// var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
|
|
||||||
// as EssentialsHuddleSpaceRoom;
|
|
||||||
// if (room != null)
|
|
||||||
// message = room.Config.HelpMessage;
|
|
||||||
// else
|
|
||||||
// message = "Sorry, no help message available. No room connected.";
|
|
||||||
// //TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
|
|
||||||
// PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
|
|
||||||
//});
|
|
||||||
uint nextJoin = 3953;
|
uint nextJoin = 3953;
|
||||||
|
|
||||||
// Lights button
|
|
||||||
//if (WHATEVER MAKES LIGHTS WORK)
|
|
||||||
//{
|
|
||||||
// // do lights
|
|
||||||
// nextIndex--;
|
|
||||||
//}
|
|
||||||
|
|
||||||
// Calendar button
|
// Calendar button
|
||||||
if (_CurrentRoom.ScheduleSource != null) // ******************* Do we need a config option here as well?
|
if (_CurrentRoom.ScheduleSource != null)
|
||||||
{
|
{
|
||||||
//var calBut = new HeaderListButton(HeaderButtonsList, nextIndex);
|
|
||||||
//calBut.SetIcon(HeaderListButton.Calendar);
|
|
||||||
//calBut.OutputSig.SetSigFalseAction(CalendarPress);
|
|
||||||
|
|
||||||
TriList.SetString(nextJoin, "Calendar");
|
TriList.SetString(nextJoin, "Calendar");
|
||||||
TriList.SetSigFalseAction(nextJoin, CalendarPress);
|
TriList.SetSigFalseAction(nextJoin, CalendarPress);
|
||||||
|
|
||||||
@@ -1062,10 +1010,6 @@ namespace PepperDash.Essentials
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Call button
|
// Call button
|
||||||
//HeaderCallButton = new HeaderListButton(HeaderButtonsList, nextJoin);
|
|
||||||
//HeaderCallButton.SetIcon(HeaderListButton.OnHook);
|
|
||||||
//HeaderCallButton.OutputSig.SetSigFalseAction(ShowActiveCallsList);
|
|
||||||
|
|
||||||
TriList.SetString(nextJoin, "DND");
|
TriList.SetString(nextJoin, "DND");
|
||||||
TriList.SetSigFalseAction(nextJoin, ShowActiveCallsList);
|
TriList.SetSigFalseAction(nextJoin, ShowActiveCallsList);
|
||||||
HeaderCallButtonIconSig = TriList.StringInput[nextJoin];
|
HeaderCallButtonIconSig = TriList.StringInput[nextJoin];
|
||||||
@@ -1075,15 +1019,10 @@ namespace PepperDash.Essentials
|
|||||||
// blank any that remain
|
// blank any that remain
|
||||||
for (var i = nextJoin; i > 3950; i--)
|
for (var i = nextJoin; i > 3950; i--)
|
||||||
{
|
{
|
||||||
//var blankBut = new HeaderListButton(HeaderButtonsList, i);
|
|
||||||
//blankBut.ClearIcon();
|
|
||||||
//blankBut.OutputSig.SetSigFalseAction(() => { });
|
|
||||||
|
|
||||||
TriList.SetString(i, "Blank");
|
TriList.SetString(i, "Blank");
|
||||||
TriList.SetSigFalseAction(i, () => { });
|
TriList.SetSigFalseAction(i, () => { });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, ShowActiveCallsList);
|
TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, ShowActiveCallsList);
|
||||||
|
|
||||||
// Set Call Status Subpage Position
|
// Set Call Status Subpage Position
|
||||||
@@ -1101,7 +1040,6 @@ namespace PepperDash.Essentials
|
|||||||
TriList.SetBool(UIBoolJoin.HeaderCallStatusRightPositionVisible, false);
|
TriList.SetBool(UIBoolJoin.HeaderCallStatusRightPositionVisible, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
HeaderButtonsAreSetUp = true;
|
HeaderButtonsAreSetUp = true;
|
||||||
|
|
||||||
ComputeHeaderCallStatus(CurrentRoom.VideoCodec);
|
ComputeHeaderCallStatus(CurrentRoom.VideoCodec);
|
||||||
@@ -1318,8 +1256,6 @@ namespace PepperDash.Essentials
|
|||||||
(previousDev as IPower).UnlinkButtons(TriList);
|
(previousDev as IPower).UnlinkButtons(TriList);
|
||||||
if (previousDev is ITransport)
|
if (previousDev is ITransport)
|
||||||
(previousDev as ITransport).UnlinkButtons(TriList);
|
(previousDev as ITransport).UnlinkButtons(TriList);
|
||||||
//if (previousDev is IRadio)
|
|
||||||
// (previousDev as IRadio).UnlinkButtons(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -663,7 +663,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
/// <param name="dir"></param>
|
/// <param name="dir"></param>
|
||||||
void RefreshDirectory()
|
void RefreshDirectory()
|
||||||
{
|
{
|
||||||
Debug.Console(0, "****** RefreshDirectory!");
|
|
||||||
if (CurrentDirectoryResult.DirectoryResults.Count > 0)
|
if (CurrentDirectoryResult.DirectoryResults.Count > 0)
|
||||||
{
|
{
|
||||||
ushort i = 0;
|
ushort i = 0;
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user