jens/Automation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

full day time window

Browse Source
This commit is contained in:
jens 2022-05-21 02:33:56 +02:00
parent 7046cccabe
commit 5786c1bfd4
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/jens/automation2/Trigger.java
View File

@ -884,20 +884,24 @@ public class Trigger
if( if(
// Regular case, start time is lower than end time // Regular case, start time is lower than end time
( (
Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0 Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0
&& &&
Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0 Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0
)
||
// Other case, start time higher than end time, timeframe goes over midnight
(
Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) < 0
&&
(Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0
||
Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0)
)
||
// further case: start and end times are identical, meaning a 24h window
(
Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) == 0
) )
|
// Other case, start time higher than end time, timeframe goes over midnight
(
Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) < 0
&&
(Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0
||
Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0)
)
) )
{ {
// We are in the timeframe // We are in the timeframe