Merge remote-tracking branch 'origin/client' into client

This commit is contained in:
fabjuuuh
2020-09-25 13:18:49 +02:00

View File

@@ -1,5 +1,7 @@
using System; using System;
using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text;
using ProftaakRH; using ProftaakRH;
namespace Client namespace Client
@@ -70,14 +72,14 @@ namespace Client
Array.Copy(totalBuffer, 0, messageBytes, 0, expectedMessageLength); Array.Copy(totalBuffer, 0, messageBytes, 0, expectedMessageLength);
string identifier; string identifier;
bool isJson = DataParser.getJsonIdentifier(this.buffer, out identifier); bool isJson = DataParser.getJsonIdentifier(messageBytes, out identifier);
if (isJson) if (isJson)
{ {
throw new NotImplementedException(); Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(messageBytes.Skip(5).ToArray())}");
} }
else if (DataParser.isRawData(this.buffer)) else if (DataParser.isRawData(messageBytes))
{ {
throw new NotImplementedException(); Console.WriteLine($"Received data: {BitConverter.ToString(messageBytes.Skip(5).ToArray())}");
} }
totalBufferReceived -= expectedMessageLength; totalBufferReceived -= expectedMessageLength;