mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-25 17:02:14 +01:00
Compare commits
5 Commits
ead1def4bb
...
60f31595d4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60f31595d4 | ||
|
|
7194d7f613 | ||
|
|
af02a70600 | ||
|
|
77d8e0607d | ||
|
|
d6d12bc93c |
@@ -5130,6 +5130,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
vElapsed = vElapsed.slice(1);
|
vElapsed = vElapsed.slice(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (vElapsed == 0) {
|
||||||
|
vElapsed = '0:00';
|
||||||
|
}
|
||||||
let vDuration = Duration;
|
let vDuration = Duration;
|
||||||
if (vDuration.length == 5) {
|
if (vDuration.length == 5) {
|
||||||
if(parseInt(vDuration.slice(0,2)) < 9) {
|
if(parseInt(vDuration.slice(0,2)) < 9) {
|
||||||
@@ -9691,8 +9694,8 @@ type PageAlarm = NSPanel.PageAlarm;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param time object: { hour: number, minutes: number } | starttime
|
* @param time object { hour: number, minutes: number } | number: Time as number in ms
|
||||||
* @param repeatTime in ms
|
* @param repeatTime in seconds
|
||||||
* @param callback what todo
|
* @param callback what todo
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
@@ -9703,7 +9706,7 @@ function adapterSchedule(time: {hour?: number, minute?: number} | undefined | nu
|
|||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
function _schedule(time: {hour?: number, minute?: number} | undefined | number, ref: number, repeatTime, callback, init: boolean = false) {
|
function _schedule(time: {hour?: number, minute?: number} | undefined | number, ref: number, repeatTime: number, callback, init: boolean = false) {
|
||||||
if (!scheduleList[ref]) return;
|
if (!scheduleList[ref]) return;
|
||||||
if (!init) callback();
|
if (!init) callback();
|
||||||
let targetTime: number;
|
let targetTime: number;
|
||||||
@@ -9714,12 +9717,12 @@ function _schedule(time: {hour?: number, minute?: number} | undefined | number,
|
|||||||
targetTime = time + repeatTime * 1000;
|
targetTime = time + repeatTime * 1000;
|
||||||
time = targetTime;
|
time = targetTime;
|
||||||
} else {
|
} else {
|
||||||
time.hour = time.hour !== undefined ? time.hour : 1;
|
time.hour = time.hour !== undefined ? time.hour : -1;
|
||||||
time.minute = time.minute !== undefined ? time.minute : 0;
|
time.minute = time.minute !== undefined ? time.minute : 0;
|
||||||
targetTime = time.hour !== -1 ? new Date().setHours(time.hour, time.minute, 0) : new Date().setMinutes(time.minute, 0);
|
targetTime = time.hour !== -1 ? new Date().setHours(time.hour, time.minute, 0, 0) : new Date().setMinutes(time.minute, 0, 0);
|
||||||
if (new Date().getTime() > targetTime) {
|
if (new Date().getTime() >= targetTime) {
|
||||||
targetTime += repeatTime * 1000;
|
targetTime += repeatTime * 1000;
|
||||||
targetTime = time.hour !== -1 ? new Date(targetTime).setHours(time.hour, time.minute, 0) : new Date(targetTime).setMinutes(time.minute, 0);
|
targetTime = time.hour !== -1 ? new Date(targetTime).setHours(time.hour, time.minute, 0, 0) : new Date(targetTime).setMinutes(time.minute, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const timeout = targetTime - new Date().getTime();
|
const timeout = targetTime - new Date().getTime();
|
||||||
|
|||||||
Reference in New Issue
Block a user