diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java index f6a818e68..03ea31bfb 100644 --- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java @@ -44,8 +44,8 @@ public class ServerHandler { users.remove(context); } - void onBinaryMessage(WsBinaryMessageContext data) throws Exception { - Map deserialized = objectMapper.readValue(ArrayUtils.toPrimitive(data.data()), new TypeReference>(){}); + void onBinaryMessage(WsBinaryMessageContext context) throws Exception { + Map deserialized = objectMapper.readValue(ArrayUtils.toPrimitive(context.data()), new TypeReference>(){}); for (Map.Entry entry: deserialized.entrySet()) { try { switch (entry.getKey()) { @@ -87,14 +87,18 @@ public class ServerHandler { } catch (Exception e) { e.printStackTrace(); } + broadcastMessage(deserialized,context); } } private void setField(Object obj, String fieldName, Object value) { try { Field field = obj.getClass().getField(fieldName); if (BeanUtils.isSimpleValueType(field.getType())){ - //if enum needs to convert - field.set(obj,value); + if (field.getType().isEnum()){ + field.set(obj,field.getType().getEnumConstants()[(Integer) value]); + }else{ + field.set(obj,value); + } } else if(field.getType() == List.class){ field.set(obj,value); } diff --git a/New client/chameleon-client/src/views/Camera.vue b/New client/chameleon-client/src/views/Camera.vue index 21930ad84..d3a71dd82 100644 --- a/New client/chameleon-client/src/views/Camera.vue +++ b/New client/chameleon-client/src/views/Camera.vue @@ -58,7 +58,7 @@
- + Normal Threshold