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

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

Browse Source
This commit is contained in:
shinichi
2020-10-19 12:24:09 +02:00
parent dcf6c3c6d0 689f7030e4
commit d98c32a508
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ClientApp/Utils/Client.cs
View File

@@ -163,6 +163,9 @@ namespace ClientApp.Utils
sendMessage(DataParser.getSetResistanceResponseJson(true)); sendMessage(DataParser.getSetResistanceResponseJson(true));
} }
break; break;
case DataParser.MESSAGE:
engineConnection.DoctorMessage = DataParser.getChatMessageFromJson(payloadbytes);
break;
case DataParser.NEW_CONNECTION: case DataParser.NEW_CONNECTION:
this.LoginViewModel.DoctorConnected(DataParser.getUsernameFromJson(payloadbytes)); this.LoginViewModel.DoctorConnected(DataParser.getUsernameFromJson(payloadbytes));
break; break;

5
ClientApp/Utils/EngineConnection.cs
View File

@@ -43,8 +43,8 @@ namespace ClientApp.Utils
private static string headId = string.Empty; private static string headId = string.Empty;
private static string groundPlaneId = string.Empty; private static string groundPlaneId = string.Empty;
private static string terrainId = string.Empty; private static string terrainId = string.Empty;
private static string lastMessage = "No message received yet";
public string DoctorMessage { get; set; };
public float BikeSpeed { get; set; } public float BikeSpeed { get; set; }
public float BikePower { get; set; } public float BikePower { get; set; }
public float BikeBPM { get; set; } public float BikeBPM { get; set; }
@@ -65,6 +65,7 @@ namespace ClientApp.Utils
BikePower = 0; BikePower = 0;
BikeBPM = 0; BikeBPM = 0;
BikeResistance = 50; BikeResistance = 50;
DoctorMessage = "No message received yet";
updateTimer = new System.Timers.Timer(1000); updateTimer = new System.Timers.Timer(1000);
updateTimer.Elapsed += UpdateTimer_Elapsed; updateTimer.Elapsed += UpdateTimer_Elapsed;
updateTimer.AutoReset = true; updateTimer.AutoReset = true;
@@ -324,7 +325,7 @@ namespace ClientApp.Utils
{ {
// TODO check if is drawn // TODO check if is drawn
}); });
SendMessageAndOnResponse(mainCommand.showMessage(panelId, "message", lastMessage), "message", SendMessageAndOnResponse(mainCommand.showMessage(panelId, "message", DoctorMessage), "message",
(message) => (message) =>
{ {
// TODO check if is drawn // TODO check if is drawn