[FIX] correct remaining time calculation at night before midnight, set body max-width
This commit is contained in:
parent
85f3ee44ca
commit
b0a675ab3d
3 changed files with 20 additions and 6 deletions
|
@ -70,10 +70,10 @@ class LightStatus {
|
|||
$startTime = strtotime($this->times[$timeKey]['on']);
|
||||
$stopTime = strtotime($this->times[$timeKey]['off']);
|
||||
if ($stopTime < $startTime) {
|
||||
$stopTime += (24 * 60 * 60);
|
||||
if (($stopTime - $currentTime) > (24 * 60 * 60)) {
|
||||
$startTime -= (24 * 60 * 60);
|
||||
$stopTime -= (24 * 60 * 60);
|
||||
$stopTime += (24*60*60);
|
||||
if (($stopTime - $currentTime) > (24*60*60)) {
|
||||
$startTime -= (24*60*60);
|
||||
$stopTime -= (24*60*60);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -82,6 +82,16 @@ class LightStatus {
|
|||
$this->changeTime = (int)(($stopTime - $currentTime) / 60);
|
||||
$this->waitTime = 1;
|
||||
return true;
|
||||
} elseif ($currentTime < $startTime || ($startTime+(24*60*60) - $currentTime) < (12*60*60) ) {
|
||||
// right before the next time interval
|
||||
$this->state = false;
|
||||
if ($currentTime < $startTime) {
|
||||
$this->changeTime = (int)( ($startTime - $currentTime) / 60 );
|
||||
} else {
|
||||
$this->changeTime = (int)( (($startTime+(24*60*60)) - $currentTime) / 60 );
|
||||
}
|
||||
$this->waitTime = 1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue