From 8a490eb39981891b0a537174eb208ee0e30401fe Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Thu, 22 Oct 2020 22:22:24 +0200 Subject: [PATCH] [FIX] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --- Client/ViewModels/ViewModelGame.cs | 6 +++--- SharedClientServer/JSONConvert.cs | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs index a6bcf68..b1b01e3 100644 --- a/Client/ViewModels/ViewModelGame.cs +++ b/Client/ViewModels/ViewModelGame.cs @@ -24,7 +24,7 @@ namespace Client.ViewModels public Color color; public double[][] buffer; public int pos = 0; - public int maxLines = 1; + public int maxLines = 50; public Queue linesQueue; private Timer queueTimer; @@ -83,7 +83,7 @@ namespace Client.ViewModels public void BeginGame() { - queueTimer = new Timer(500); + queueTimer = new Timer(50); queueTimer.Start(); queueTimer.Elapsed += sendArrayFromQueue; data.Client.SendMessage(JSONConvert.ConstructGameStartData(data.Lobby.ID)); @@ -149,7 +149,7 @@ namespace Client.ViewModels { Debug.WriteLine("[GAME] sending canvas data..."); double[][] temp = linesQueue.Dequeue(); - data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.CANVAS, JSONConvert.ConstructDrawingCanvasData(temp,color))); + data.Client.SendMessage(JSONConvert.ConstructDrawingCanvasData(temp,color)); } } diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs index 5c9ba1d..b24e55f 100644 --- a/SharedClientServer/JSONConvert.cs +++ b/SharedClientServer/JSONConvert.cs @@ -173,16 +173,13 @@ namespace SharedClientServer canvasType = CANVAS_WRITING, coords = buffer, color = colorToSend - }); ; + }); } - public static int GetCanvasMessageType(byte[] payload) + public static int GetCanvasMessageType(byte[] json) { - dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload)); - var temp = Convert.FromBase64String(json); - string fdasf = System.Text.Encoding.UTF8.GetString(temp); - int cType = temp.canvasType; - return cType; + dynamic d = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(json)); + return d.canvasType; } public static double[][] getCoordinates(byte[] payload)