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

updates & fixes for countdown timer

Browse Source
This commit is contained in:
Andrew Welker
2021-02-23 15:53:07 -07:00
parent 10046a9ed4
commit eef3b5fb31
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
essentials-framework/Essentials Core/PepperDashEssentialsBase/Timers/CountdownTimer.cs
View File

@@ -17,7 +17,7 @@ namespace PepperDash.Essentials.Core
public string Key { get; private set; } public string Key { get; private set; }
public BoolFeedback IsRunningFeedback { get; private set; } public BoolFeedback IsRunningFeedback { get; private set; }
bool _IsRunning; bool _isRunning;
public IntFeedback PercentFeedback { get; private set; } public IntFeedback PercentFeedback { get; private set; }
public StringFeedback TimeRemainingFeedback { get; private set; } public StringFeedback TimeRemainingFeedback { get; private set; }
@@ -41,34 +41,32 @@ namespace PepperDash.Essentials.Core
public SecondsCountdownTimer(string key) public SecondsCountdownTimer(string key)
{ {
Key = key; Key = key;
IsRunningFeedback = new BoolFeedback(() => _IsRunning); IsRunningFeedback = new BoolFeedback(() => _isRunning);
TimeRemainingFeedback = new StringFeedback(() => TimeRemainingFeedback = new StringFeedback(() =>
{ {
// Need to handle up and down here. // Need to handle up and down here.
if (StartTime == null || FinishTime == null)
return "";
var timeSpan = FinishTime - DateTime.Now; var timeSpan = FinishTime - DateTime.Now;
if (timeSpan.TotalSeconds < 60) if (timeSpan.TotalSeconds < 60)
{ {
return Math.Round(timeSpan.TotalSeconds).ToString(); return Math.Round(timeSpan.TotalSeconds).ToString();
} }
else if (timeSpan.TotalSeconds < 0)
{
return "0";
}
else else
{ {
Debug.Console(2, this, "timeSpan.Minutes == {0}, timeSpan.Seconds == {1}", timeSpan.Minutes, timeSpan.Seconds); Debug.Console(2, this, "timeSpan.Minutes == {0}, timeSpan.Seconds == {1}", timeSpan.Minutes, timeSpan.Seconds);
return String.Format("{0:D2}:{1:D2}", return String.Format("{0:c}", timeSpan);
timeSpan.Minutes,
timeSpan.Seconds);
} }
}); });
PercentFeedback = new IntFeedback(() => PercentFeedback = new IntFeedback(() =>
{ {
if (StartTime == null || FinishTime == null) var percent = (FinishTime - DateTime.Now).TotalSeconds
return 0;
double percent = (FinishTime - DateTime.Now).TotalSeconds
/ (FinishTime - StartTime).TotalSeconds / (FinishTime - StartTime).TotalSeconds
* 100; * 100;
return (int)percent; return (int)percent;
@@ -80,7 +78,7 @@ namespace PepperDash.Essentials.Core
/// </summary> /// </summary>
public void Start() public void Start()
{ {
if (_IsRunning) if (_isRunning)
return; return;
StartTime = DateTime.Now; StartTime = DateTime.Now;
FinishTime = StartTime + TimeSpan.FromSeconds(SecondsToCount); FinishTime = StartTime + TimeSpan.FromSeconds(SecondsToCount);
@@ -88,7 +86,7 @@ namespace PepperDash.Essentials.Core
if (SecondTimer != null) if (SecondTimer != null)
SecondTimer.Stop(); SecondTimer.Stop();
SecondTimer = new CTimer(SecondElapsedTimerCallback, null, 0, 1000); SecondTimer = new CTimer(SecondElapsedTimerCallback, null, 0, 1000);
_IsRunning = true; _isRunning = true;
IsRunningFeedback.FireUpdate(); IsRunningFeedback.FireUpdate();
var handler = HasStarted; var handler = HasStarted;
@@ -101,7 +99,7 @@ namespace PepperDash.Essentials.Core
/// </summary> /// </summary>
public void Reset() public void Reset()
{ {
_IsRunning = false; _isRunning = false;
Start(); Start();
} }
@@ -133,7 +131,7 @@ namespace PepperDash.Essentials.Core
{ {
if (SecondTimer != null) if (SecondTimer != null)
SecondTimer.Stop(); SecondTimer.Stop();
_IsRunning = false; _isRunning = false;
IsRunningFeedback.FireUpdate(); IsRunningFeedback.FireUpdate();
} }