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 60d7276f7ce4ad7e46452daaad4d70a198e81341..eecbc7bda63fbbbee31a5e79751601f08e328cb0 100644 (file)
--- a/Event/Event.groovy
+++ b/Event/Event.groovy
@@ -1,5 +1,6 @@
 //Create a class for Events
 package Event
+import groovy.json.JsonSlurper
 
 public class Event {
        private String deviceId
@@ -12,6 +13,7 @@ public class Event {
        private boolean isStateChange
        private String unit
        private String data
+       private jsonData
        private int integerValue
        private double doubleValue
        private List integerValues = ["battery", "hue", "saturation", "energy", "level", "temperature", 
@@ -27,6 +29,7 @@ public class Event {
                this.isStateChange = isStateChange
                this.unit = unit
                this.data = data
+               this.jsonData = new groovy.json.JsonSlurper().parseText(data)
                this.displayed = displayed
                if (integerValues.contains(name)) {
                        this.integerValue = value.toInteger()