sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge Develop into master #9

Merged
SemvdH merged 66 commits from develop into master 2020-09-25 14:51:29 +00:00
Conversation 5 Commits 66 Files Changed 22 +6 -4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97e6a528bb - Show all commits

10
Client/Client.cs
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;