projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improvements and new methods
[smartthings-infrastructure.git]
/
Methods
/
schedule.groovy
diff --git
a/Methods/schedule.groovy
b/Methods/schedule.groovy
index 307b221e25c3f2a89cd3f6f3981ec78648d5252d..f4fcf24cc318f2eeebd4d666a5612bb836666948 100644
(file)
--- a/
Methods/schedule.groovy
+++ b/
Methods/schedule.groovy
@@
-1,49
+1,56
@@
/////////////////////////////////////////////////////////////////////
////schedule(time, nameOfFunction as String)
def schedule(String time, String nameOfFunction) {
/////////////////////////////////////////////////////////////////////
////schedule(time, nameOfFunction as String)
def schedule(String time, String nameOfFunction) {
- /
/
def _inputTime = time.split(':')
- //Date date = new Date()
-
//
def _currentTime = date.format("HH:mm:ss").split(':')
+ /
*
def _inputTime = time.split(':')
+ Date date = new Date()
+ def _currentTime = date.format("HH:mm:ss").split(':')
-
//
Convert input time and current time to minutes
-
//
def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
-
//
def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
-
//
def delay
+ Convert input time and current time to minutes
+ def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
+ def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
+ def delay
-
//
if (inputTime < currentTime) {
-
//
delay = 24*60*60-inputTime+currentTime
-
//
} else {
-
//
delay = inputTime-currentTime
-
//
}
+ if (inputTime < currentTime) {
+
delay = 24*60*60-inputTime+currentTime
+ } else {
+
delay = inputTime-currentTime
+ }
timersFuncList.add(nameOfFunction)
timersList.add(new SimulatedTimer())
timersFuncList.add(nameOfFunction)
timersList.add(new SimulatedTimer())
- def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(
/*delay*1000*0*/
0) {
+ def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(
delay*1000*
0) {
"$nameOfFunction"()
"$nameOfFunction"()
- }
+ }*/
+ "$nameOfFunction"()
+}
+/////////////////////////////////////////////////////////////////////
+////schedule(Date, nameOfFunction as String)
+def schedule(Date date, String nameOfFunction) {
+ "$nameOfFunction"()
}
////schedule(time, nameOfFunction as Closure)
def schedule(String time, Closure nameOfFunction) {
}
////schedule(time, nameOfFunction as Closure)
def schedule(String time, Closure nameOfFunction) {
- /
/
def _inputTime = time.split(':')
- //Date date = new Date()
-
//
def _currentTime = date.format("HH:mm:ss").split(':')
+ /
*
def _inputTime = time.split(':')
+ Date date = new Date()
+ def _currentTime = date.format("HH:mm:ss").split(':')
-
//
Convert input time and current time to minutes
-
//
def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
-
//
def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
-
//
def delay
+ Convert input time and current time to minutes
+ def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
+ def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
+ def delay
-
//
if (inputTime < currentTime) {
-
//
delay = 24*60*60-inputTime+currentTime
-
//
} else {
-
//
delay = inputTime-currentTime
-
//
}
+ if (inputTime < currentTime) {
+
delay = 24*60*60-inputTime+currentTime
+ } else {
+
delay = inputTime-currentTime
+ }
if (timersFuncList.contains(nameOfFunction)) {
timersList[timersFuncList.indexOf(nameOfFunction)].cancel()
if (timersFuncList.contains(nameOfFunction)) {
timersList[timersFuncList.indexOf(nameOfFunction)].cancel()
- def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(
/*delay*0*/0, nameOfFunction0
)
+ def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(
0, nameOfFunction
)
} else {
timersFuncList.add(nameOfFunction)
timersList.add(new SimulatedTimer())
} else {
timersFuncList.add(nameOfFunction)
timersList.add(new SimulatedTimer())
- def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*0*/0, nameOfFunction)
- }
+ def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(0, nameOfFunction)
+ }*/
+ nameOfFunction()
}
}