mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-26 21:04:08 +00:00
Merge pull request #1296 from vlaminck/GWU-completion-percentage-fix
Fix: Cleanup event feed when dimming cycle ends
This commit is contained in:
@@ -454,17 +454,23 @@ def sendStopEvent(source) {
|
|||||||
eventData.value += "cancelled"
|
eventData.value += "cancelled"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// send 100% completion event
|
||||||
|
sendTimeRemainingEvent(100)
|
||||||
|
|
||||||
|
// send a non-displayed 0% completion to reset tiles
|
||||||
|
sendTimeRemainingEvent(0, false)
|
||||||
|
|
||||||
|
// send sessionStatus event last so the event feed is ordered properly
|
||||||
sendControllerEvent(eventData)
|
sendControllerEvent(eventData)
|
||||||
sendTimeRemainingEvent(0)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def sendTimeRemainingEvent(percentComplete) {
|
def sendTimeRemainingEvent(percentComplete, displayed = true) {
|
||||||
log.trace "sendTimeRemainingEvent(${percentComplete})"
|
log.trace "sendTimeRemainingEvent(${percentComplete})"
|
||||||
|
|
||||||
def percentCompleteEventData = [
|
def percentCompleteEventData = [
|
||||||
name: "percentComplete",
|
name: "percentComplete",
|
||||||
value: percentComplete as int,
|
value: percentComplete as int,
|
||||||
displayed: true,
|
displayed: displayed,
|
||||||
isStateChange: true
|
isStateChange: true
|
||||||
]
|
]
|
||||||
sendControllerEvent(percentCompleteEventData)
|
sendControllerEvent(percentCompleteEventData)
|
||||||
@@ -474,7 +480,7 @@ def sendTimeRemainingEvent(percentComplete) {
|
|||||||
def timeRemainingEventData = [
|
def timeRemainingEventData = [
|
||||||
name: "timeRemaining",
|
name: "timeRemaining",
|
||||||
value: displayableTime(timeRemaining),
|
value: displayableTime(timeRemaining),
|
||||||
displayed: true,
|
displayed: displayed,
|
||||||
isStateChange: true
|
isStateChange: true
|
||||||
]
|
]
|
||||||
sendControllerEvent(timeRemainingEventData)
|
sendControllerEvent(timeRemainingEventData)
|
||||||
@@ -608,8 +614,6 @@ private completion() {
|
|||||||
handleCompletionMessaging()
|
handleCompletionMessaging()
|
||||||
|
|
||||||
handleCompletionModesAndPhrases()
|
handleCompletionModesAndPhrases()
|
||||||
|
|
||||||
sendTimeRemainingEvent(100)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleCompletionSwitches() {
|
private handleCompletionSwitches() {
|
||||||
|
|||||||
Reference in New Issue
Block a user