diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java index 5a2d1c3f9..6fff265f1 100644 --- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java @@ -85,12 +85,13 @@ public class ServerHandler { } else setValue(CameraManager.getCurrentPipeline(), key, value);//All of the other assignments fields - + broadcastMessage(data.data()); System.out.println(ToStringBuilder.reflectionToString(CameraManager.getCurrentPipeline()));//Print all pipeline data for debugging break; } } } catch (Exception e) { + e.printStackTrace(); unexpectedData(key, value); } } @@ -185,6 +186,6 @@ public class ServerHandler { System.err.println("No camera found!"); //TODO: add message to ui to inform that there are no cameras } - broadcastMessage(fullSettings); +// broadcastMessage(fullSettings); } } diff --git a/New client/chameleon-client/src/App.vue b/New client/chameleon-client/src/App.vue index e7eb67e95..69d3279d2 100644 --- a/New client/chameleon-client/src/App.vue +++ b/New client/chameleon-client/src/App.vue @@ -53,17 +53,16 @@ export default { created(){ this.$options.sockets.onmessage = (data) =>{ try{ - // let message = JSON.parse(data.data); - let message = this.$msgPack().decode(data.data); + let info = new Uint8Array(data.data.substring(1, data.data.length-1).split(","));//Converts incoming data to data that msgpack can decode + let message = this.$msgPack().decode(info); for(let prop in message){ if(message.hasOwnProperty(prop)){ - // this.handleMessage(prop,message[prop]); console.log(message); } } } - catch{ - console.error('error: ' + data.data); + catch(error){ + console.error('error: ' + data.data+ " , "+ error); } } }