edit

[smartthings-infrastructure.git] / Methods / eventHandler.groovy

diff --git a/Methods/eventHandler.groovy b/Methods/eventHandler.groovy
index b838418bf64c12cbba30b99e4b4804d8fa919686..59bb059fe9086f4f9b7dfa82ef55c024e37765d8 100644 (file)
--- a/Methods/eventHandler.groovy
+++ b/Methods/eventHandler.groovy
@@ -11,16 +11,28 @@ def eventHandler(LinkedHashMap eventDataMap) {
        def data = eventDataMap["data"]
 
        for (int i = 0;i < app2.eventList.size();i++) {
-               if (app2.eventList[i] == name) {
+               if (app2.eventList[i] == name &&
+                   (app2.valueList[i] == "" || app2.valueList[i] == value)) {
                        def event = new Event(value, name, deviceId, descriptionText, displayed, linkText, linkText, isStateChange, unit, data)
-                       app2.functionList[i](event)
+                       if (app2.functionList[i] instanceof String) {
+                               String toCall = app2.functionList[i]
+                               app2."$toCall"(event)
+                       }
+                       else
+                               app2.functionList[i](event)
                }
        }
 
        for (int i = 0;i < app1.eventList.size();i++) {
-               if (app1.eventList[i] == name) {
-                       def event = new Event(value, name, deviceId, descriptionText, displayed, linkText, linkText, isStateChange, unit, data)
-                       app1.functionList[i](event)
+               if (app1.eventList[i] == name &&
+                   (app1.valueList[i] == "" || app1.valueList[i] == value)) {
+                        def event = new Event(value, name, deviceId, descriptionText, displayed, linkText, linkText, isStateChange, unit, data)
+                       if (app1.functionList[i] instanceof String) {
+                               String toCall = app1.functionList[i]
+                               app1."$toCall"(event)
+                       }
+                       else
+                               app1.functionList[i](event)
                }
        }
 }