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

server now gets response when resistance is set

Browse Source
This commit is contained in:
shinichi
2020-09-30 19:40:37 +02:00
parent adea08cfb7
commit a5e679e6fb
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Client/Client.cs
View File

@@ -95,22 +95,22 @@ namespace Client
break; break;
case DataParser.START_SESSION: case DataParser.START_SESSION:
this.sessionRunning = true; this.sessionRunning = true;
byte[] startSession = DataParser.getStartSessionJson(); sendMessage(DataParser.getStartSessionJson());
stream.BeginWrite(startSession, 0, startSession.Length, new AsyncCallback(OnWrite), null);
break; break;
case DataParser.STOP_SESSION: case DataParser.STOP_SESSION:
this.sessionRunning = false; this.sessionRunning = false;
byte[] stopSession = DataParser.getStopSessionJson(); sendMessage(DataParser.getStopSessionJson());
stream.BeginWrite(stopSession, 0, stopSession.Length, new AsyncCallback(OnWrite), null);
break; break;
case DataParser.SET_RESISTANCE: case DataParser.SET_RESISTANCE:
if (this.handler == null) if (this.handler == null)
{ {
Console.WriteLine("handler is null"); Console.WriteLine("handler is null");
sendMessage(DataParser.getSetResistanceResponseJson(false));
} }
else else
{ {
this.handler.setResistance(DataParser.getResistanceFromJson(payloadbytes)); this.handler.setResistance(DataParser.getResistanceFromJson(payloadbytes));
sendMessage(DataParser.getSetResistanceResponseJson(true));
} }
break; break;
default: default:
@@ -131,6 +131,11 @@ namespace Client
} }
private void sendMessage(byte[] message)
{
stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
}
private void OnWrite(IAsyncResult ar) private void OnWrite(IAsyncResult ar)
{ {
this.stream.EndWrite(ar); this.stream.EndWrite(ar);

14
Client/DataParser.cs
View File

@@ -182,11 +182,25 @@ namespace Client
return getJsonMessage(SET_RESISTANCE, data); return getJsonMessage(SET_RESISTANCE, data);
} }
public static byte[] getSetResistanceResponseJson(bool mWorked)
{
dynamic data = new
{
worked = mWorked
};
return getJsonMessage(SET_RESISTANCE, data);
}
public static float getResistanceFromJson(byte[] json) public static float getResistanceFromJson(byte[] json)
{ {
return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.resistance; return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.resistance;
} }
public static bool getResistanceFromResponseJson(byte[] json)
{
return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.worked;
}
} }
} }

6
Server/Client.cs
View File

@@ -122,6 +122,11 @@ namespace Server
case DataParser.STOP_SESSION: case DataParser.STOP_SESSION:
this.saveData = null; this.saveData = null;
break; break;
case DataParser.SET_RESISTANCE:
worked = DataParser.getResistanceFromResponseJson(payloadbytes);
Console.WriteLine($"set resistance worked is " + worked);
//set resistance on doctor GUI
break;
default: default:
Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}"); Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}");
break; break;
@@ -138,7 +143,6 @@ namespace Server
else if (payloadbytes.Length == 2) else if (payloadbytes.Length == 2)
{ {
saveData?.WriteDataRAWBPM(payloadbytes); saveData?.WriteDataRAWBPM(payloadbytes);
sendMessage(DataParser.getSetResistanceJson(50));
} }
else else
{ {