Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / Event / Event.groovy

diff --git a/Event/Event.groovy b/Event/Event.groovy
index 794dbca4387c59a98b08241e082f1ecba0e717f5..60d7276f7ce4ad7e46452daaad4d70a198e81341 100644 (file)
--- a/Event/Event.groovy
+++ b/Event/Event.groovy
@@ -2,7 +2,7 @@
 package Event
 
 public class Event {
-       private int deviceId
+       private String deviceId
        private String value
        private String linkText
        private String displayName
@@ -11,9 +11,13 @@ public class Event {
        private String descriptionText
        private boolean isStateChange
        private String unit
-       private ArrayList data
+       private String data
+       private int integerValue
+       private double doubleValue
+       private List integerValues = ["battery", "hue", "saturation", "energy", "level", "temperature", 
+                                     "heatingSetpoint", "coolingSetpoint", "thermostatSetpoint", "illuminance"]
        
-       Event(String value, String name, int deviceId, String descriptionText, boolean displayed, String linkText, String displayName, boolean isStateChange, String unit, ArrayList data) {
+       Event(String value, String name, String deviceId, String descriptionText, boolean displayed, String linkText, String displayName, boolean isStateChange, String unit, String data) {
                this.deviceId = deviceId
                this.linkText = linkText
                this.value = value
@@ -24,5 +28,9 @@ public class Event {
                this.unit = unit
                this.data = data
                this.displayed = displayed
+               if (integerValues.contains(name)) {
+                       this.integerValue = value.toInteger()
+                       this.doubleValue = Double.parseDouble(value);           
+               }
        }
 }