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

Merge pull request #630 from PepperDash/bugfix/countdownTimer-fixes

Browse Source 
SecondsCountdownTimer fixes
This commit is contained in:
Andrew Welker
2021-02-24 15:03:58 -07:00
committed by GitHub
parent 9588564633 70d4a7054f
commit c5aef18943
1 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
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; }
@@ -32,7 +32,7 @@ namespace PepperDash.Essentials.Core
public DateTime StartTime { get; private set; } public DateTime StartTime { get; private set; }
public DateTime FinishTime { get; private set; } public DateTime FinishTime { get; private set; }
CTimer SecondTimer; private CTimer _secondTimer;
/// <summary> /// <summary>
/// Constructor /// Constructor
@@ -41,38 +41,34 @@ 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) Debug.Console(2, this,
"timeSpan.Minutes == {0}, timeSpan.Seconds == {1}, timeSpan.TotalSeconds == {2}",
timeSpan.Minutes, timeSpan.Seconds, timeSpan.TotalSeconds);
if (Math.Floor(timeSpan.TotalSeconds) < 60 && Math.Floor(timeSpan.TotalSeconds) >= 0) //ignore milliseconds
{ {
return Math.Round(timeSpan.TotalSeconds).ToString(); return String.Format("{0:00}", timeSpan.Seconds);
}
else
{
Debug.Console(2, this, "timeSpan.Minutes == {0}, timeSpan.Seconds == {1}", timeSpan.Minutes, timeSpan.Seconds);
return String.Format("{0:D2}:{1:D2}",
timeSpan.Minutes,
timeSpan.Seconds);
} }
return Math.Floor(timeSpan.TotalSeconds) < 0
? "00"
: String.Format("{0:00}:{1:00}", timeSpan.Minutes, timeSpan.Seconds);
}); });
PercentFeedback = new IntFeedback(() => PercentFeedback =
{ new IntFeedback(
if (StartTime == null || FinishTime == null) () =>
return 0; (int)
double percent = (FinishTime - DateTime.Now).TotalSeconds (Math.Floor((FinishTime - DateTime.Now).TotalSeconds)/
/ (FinishTime - StartTime).TotalSeconds Math.Floor((FinishTime - StartTime).TotalSeconds)*100));
* 100;
return (int)percent;
});
} }
/// <summary> /// <summary>
@@ -80,15 +76,15 @@ 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);
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 +97,7 @@ namespace PepperDash.Essentials.Core
/// </summary> /// </summary>
public void Reset() public void Reset()
{ {
_IsRunning = false; _isRunning = false;
Start(); Start();
} }
@@ -131,19 +127,22 @@ namespace PepperDash.Essentials.Core
void StopHelper() void StopHelper()
{ {
if (SecondTimer != null) if (_secondTimer != null)
SecondTimer.Stop(); _secondTimer.Stop();
_IsRunning = false; _isRunning = false;
IsRunningFeedback.FireUpdate(); IsRunningFeedback.FireUpdate();
} }
void SecondElapsedTimerCallback(object o) void SecondElapsedTimerCallback(object o)
{ {
if (DateTime.Now >= FinishTime)
{
Finish();
return;
}
PercentFeedback.FireUpdate(); PercentFeedback.FireUpdate();
TimeRemainingFeedback.FireUpdate(); TimeRemainingFeedback.FireUpdate();
if (DateTime.Now >= FinishTime)
Finish();
} }
} }
} }