Merge branch 'develop'

[FIX] changes one line

ClientApp/Utils/Client.cs

@@ -21,7 +21,7 @@ namespace ClientApp.Utils
         private byte[] totalBuffer = new byte[1024];
         private int totalBufferReceived = 0;
         public EngineConnection engineConnection;
-        private bool sessionRunning = false;
+        private bool sessionRunning = true;
         private IHandler handler = null;
         private LoginViewModel LoginViewModel;
 
@@ -146,6 +146,7 @@ namespace ClientApp.Utils
                         case DataParser.STOP_SESSION:
                             Console.WriteLine("Stop session identifier");
                             this.sessionRunning = false;
+                            stopBikeInSimulation();
                             Debug.WriteLine("stop");
                             break;
                         case DataParser.SET_RESISTANCE:
@@ -230,14 +231,12 @@ namespace ClientApp.Utils
             }
             byte[] message = DataParser.GetRawBPMDataMessageServer(bytes);
 
-            if (engineConnection.Connected && engineConnection.FollowingRoute)
+            if (engineConnection != null && engineConnection.Connected && engineConnection.FollowingRoute)
             {
                 engineConnection.BikeBPM = bytes[1];
-
             }
 
-
+            this.stream?.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
-            this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
         }
 
         /// <summary>
@@ -256,21 +255,29 @@ namespace ClientApp.Utils
                 throw new ArgumentNullException("no bytes");
             }
             byte[] message = DataParser.GetRawBikeDataMessageServer(bytes);
-            bool canSendToEngine = engineConnection.Connected && engineConnection.FollowingRoute;
+            bool canSendToEngine = engineConnection != null && engineConnection.Connected && engineConnection.FollowingRoute && this.sessionRunning;
             switch (bytes[0])
             {
 
                 case 0x10:
 
                     if (canSendToEngine) engineConnection.BikeSpeed = (bytes[4] | (bytes[5] << 8)) * 0.01f;
+                    else if (engineConnection != null) engineConnection.BikeSpeed = 0;
                     break;
                 case 0x19:
                     if (canSendToEngine) engineConnection.BikePower = (bytes[5]) | (bytes[6] & 0b00001111) << 8;
+                    else if (engineConnection != null) engineConnection.BikePower = 0;
                     break;
             }
 
 
-            this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
+            this.stream?.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
+        }
+
+        private void stopBikeInSimulation()
+        {
+            engineConnection.BikeSpeed = 0;
+            engineConnection.BikePower = 0;
         }
 
         #endregion

ClientApp/Utils/EngineConnection.cs

@@ -236,7 +236,7 @@ namespace ClientApp.Utils
             Write("Starting route follow...");
             FollowingRoute = true;
 
-            SendMessageAndOnResponse(mainCommand.AddBikeModelAnim("bikeID", 0.01f), "bikeID",
+            SendMessageAndOnResponse(mainCommand.AddBikeModel("bikeID"), "bikeID",
                 (message) =>
                 {
                     bikeId = JSONParser.GetResponseUuid(message);

ClientApp/ViewModels/LoginViewModel.cs

@@ -16,7 +16,7 @@ namespace ClientApp.ViewModels
         public string Username { get; set; }
         public ICommand LoginCommand { get; set; }
 
-        public bool LoginStatus { get; set; }
+        public bool LoginStatus { get; set; } = false;
 
         public bool InvertedLoginStatus { get; set; }
 

ClientApp/Views/LoginView.xaml

@@ -19,9 +19,7 @@
             <Label Content="Password" HorizontalContentAlignment="Center"/>
             <PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
-            <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Slide" HorizontalAlignment="Center">
+            <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" IsEnabled="{Binding InvertedLoginStatus}"/>
-                <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent"/>
-            </Popup>
         </StackPanel>
     </DockPanel>
 </Page>

DoctorApp/DoctorApp.csproj

@@ -25,6 +25,7 @@
 		<PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="4.3.0" />
 		<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
 		<PackageReference Include="MvvmLightLibsStd10" Version="5.4.1.1" />
+		<PackageReference Include="Prism.Wpf" Version="8.0.0.1909" />
 		<PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
 	</ItemGroup>
 

DoctorApp/Utils/Client.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using DoctorApp.ViewModels;
+using Microsoft.Win32;
 using ProftaakRH;
 using Util;
 
@@ -129,6 +131,23 @@ namespace DoctorApp.Utils
                 {
                     MainViewModel.TransferDataToClientBPM(payloadbytes);
                 }
+                else if (DataParser.IsHistoricBikeData(messageBytes))
+                {
+
+
+                    // todo change to name of patient
+                    string name = MainViewModel.Tabs[0].PatientInfo.Username;
+                    string result = "PATIENT INFO FOR " + name + "\n\n";
+                    for (int i = 0; i < payloadbytes.Length; i += 8)
+                    {
+                        byte[] res = new byte[8];
+                        Array.Copy(payloadbytes, i, res, 0, 8);
+                        result += handleBikeHistory(res);
+                    }
+
+                    string path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/" + name + ".txt";
+                    File.WriteAllText(path,result);
+                }
                 Array.Copy(totalBuffer, expectedMessageLength, totalBuffer, 0, (totalBufferReceived - expectedMessageLength)); //maybe unsafe idk
                 totalBufferReceived -= expectedMessageLength;
                 expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
@@ -140,11 +159,40 @@ namespace DoctorApp.Utils
 
         }
 
-        /// <summary>
+        private string handleBikeHistory(byte[] bytes)
-        /// starts sending a message to the server
+        {
-        /// </summary>
+            string res = string.Empty;
-        /// <param name="message">the message to send</param>
+            switch (bytes[0])
-        public void sendMessage(byte[] message)
+            {
+                case 0x10:
+                    res += "Time elapsed: " + bytes[2] / 4 + "s\n";
+                    res += "Distance traveled: " + bytes[3] + "\n";
+                    int input = bytes[4] | (bytes[5] << 8);
+                    res += $"Speed {input * 0.01}m/s\n";
+                    res += $"Heart rate: { Convert.ToString(bytes[6], 10)}";
+                    break;
+                case 0x19:
+                    res += $"RPM: {bytes[2]}\n";
+                    int accumPower = bytes[3] | (bytes[4] << 8);
+                    res += $"Accumulated power: {accumPower} watt\n";
+                    int instantPower = (bytes[5]) | (bytes[6] & 0b00001111) << 8;
+                    if (instantPower != 0xFFF)
+                    {
+                        res += $"Instant power: {instantPower} watt\n"; 
+                    }
+                    break;
+
+            }
+            return res + "\n";
+            
+            
+        }
+
+            /// <summary>
+            /// starts sending a message to the server
+            /// </summary>
+            /// <param name="message">the message to send</param>
+            public void sendMessage(byte[] message)
         {
             stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
         }

DoctorApp/ViewModels/ClientInfoViewModel.cs

@@ -41,6 +41,8 @@ namespace DoctorApp.ViewModels
 
         public ICommand SetResistance { get; set; }
 
+        public ICommand SaveHistoricData { get; set; }
+
         public MainWindowViewModel MainWindowViewModel { get; set; }
         private Client client;
 
@@ -81,21 +83,31 @@ namespace DoctorApp.ViewModels
                 PatientInfo.Resistance = float.Parse(((TextBox)parameter).Text);
             });
 
+            // request the historic data from the server
+            this.SaveHistoricData = new RelayCommand<object>((parameter) =>
+            {
+                this.client.sendMessage(DataParser.GetGetFileMessage(PatientInfo.Username));
+                // data is stored on the server
+                // send request to server that we want to get the current historic data from the patient
+                // server sends this back
+                // we parse it
+            });
+
         }
 
-        public void BPMData(byte [] bytes)
+        public void BPMData(byte[] bytes)
         {
             //TODO
             //Parsen van de data you fuck
-            if(bytes[0] == 0x00)
+            PatientInfo.BPM = bytes[1];
+            if (bytes[0] == 0x00)
             {
 
             }
             else
             {
-                PatientInfo.BPM = bytes[1];
                 if (MySelectedItem == "BPM")
-                    {
+                {
                     Chart.NewValue(PatientInfo.BPM);
                 }
 

DoctorApp/ViewModels/MainViewModel.cs

@@ -52,13 +52,15 @@ namespace DoctorApp.ViewModels
         public void TransferDataToClientBike(byte[] bytes)
         {
             string username = DataParser.getNameFromBytesBike(bytes);
-            foreach(ClientInfoViewModel item in Tabs)
+            foreach (ClientInfoViewModel item in Tabs)
             {
-                if(item.PatientInfo.Username == username)
+                if (item.PatientInfo.Username == username)
                 {
-                    item.BikeData(DataParser.getDataWithoutName(bytes,0,8));
+                    item.BikeData(DataParser.getDataWithoutName(bytes, 0, 8));
+                    return;
                 }
             }
+            Debug.WriteLine("[MainViewModel] did not find client (bike) username is " + username);
         }
 
         public void TransferDataToClientBPM(byte[] bytes)
@@ -68,9 +70,11 @@ namespace DoctorApp.ViewModels
             {
                 if (item.PatientInfo.Username == username)
                 {
-                    item.BikeData(DataParser.getDataWithoutName(bytes, 0,2));
+                    item.BPMData(DataParser.getDataWithoutName(bytes, 0, 2));
+                    return;
                 }
             }
+            Debug.WriteLine("[MainViewModel] did not find client (bpm) username is " + username);
         }
     }
 

DoctorApp/Views/ClientInfoView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="DoctorApp.Views.ClientInfoView"
+<UserControl x:Class="DoctorApp.Views.ClientInfoView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -18,16 +18,20 @@
             <RowDefinition Height="180*"/>
             <RowDefinition Height="180*"/>
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" Grid.RowSpan="2" Margin="0,0,0,22">
+
-            <StackPanel.Resources>
+        <Grid Grid.RowSpan="2" Margin="0,0,0,22">
-                <Style TargetType="{x:Type Label}">
+            <StackPanel Orientation="Horizontal" >
-                    <Setter Property="Margin" Value="0,0,20,0"/>
+                <StackPanel.Resources>
-                </Style>
+                    <Style TargetType="{x:Type Label}">
-            </StackPanel.Resources>
+                        <Setter Property="Margin" Value="0,0,20,0"/>
-            <Label Content="{Binding Path=PatientInfo.Username}"/>
+                    </Style>
-            <Label Content="{Binding Path=PatientInfo.Status}"/>
+                </StackPanel.Resources>
-        </StackPanel>
+                <Label Content="{Binding Path=PatientInfo.Username}"/>
-        <StackPanel Margin="0,10,0,0" Grid.RowSpan="2" Grid.Row="1">
+                <Label Content="{Binding Path=PatientInfo.Status}"/>
+            </StackPanel>
+            <Button Content="Save Historic Data" HorizontalAlignment="Right" VerticalAlignment="Center" Padding="5" Command="{Binding SaveHistoricData}"/>
+        </Grid>
+        <StackPanel Margin="0,10,0,0"  Grid.Row="2">
             <StackPanel.Resources>
                 <Style TargetType="{x:Type DockPanel}">
                     <Setter Property="Margin" Value="0,20,0,0"/>
@@ -40,7 +44,7 @@
             </DockPanel>
             <DockPanel Height="26" LastChildFill="False" HorizontalAlignment="Stretch">
                 <TextBox Name="textBox_Resistance" Text="{Binding Path=PatientInfo.Resistance}" TextWrapping="Wrap" Width="110" DockPanel.Dock="Right" IsReadOnly="true"/>
-                <TextBox Name="textBox_CurrentSpeed" Text="{Binding Path=PatientInfo.Speed}" TextWrapping="Wrap" Width="110" DockPanel.Dock="Left" IsReadOnly="true"/>
+                <TextBox Name="textBox_CurrentSpeed" Text="{Binding Path=PatientInfo.Speed, StringFormat=N2}" TextWrapping="Wrap" Width="110" DockPanel.Dock="Left" IsReadOnly="true"/>
                 <TextBox Name="textBox_CurrentBPM" Text="{Binding Path=PatientInfo.BPM}" TextWrapping="Wrap" Width="110" DockPanel.Dock="Top" Height="26" IsReadOnly="true"/>
             </DockPanel>
             <DockPanel Height="26" LastChildFill="False">

DoctorApp/Views/MainWindow.xaml

@@ -10,7 +10,7 @@
         AllowsTransparency="True"
          MinHeight="{Binding MinimumHeight}"
         MinWidth="{Binding MinimumWidth}"
-        Title="MainWindow" Height="500" Width="900">
+        Title="MainWindow" Height="800" Width="1500">
     <Window.Resources>
         <Style TargetType="{x:Type local:MainWindow}">
             <Setter Property="Template">

Hashing/DataParser.cs

@@ -23,6 +23,7 @@ namespace Util
         public const string DISCONNECT = "DISCONNECT";
         public const string LOGIN_DOCTOR = "LOGIN DOCTOR";
         public const string MESSAGE = "MESSAGE";
+        public const string GET_FILE = "GET FILE";
         /// <summary>
         /// makes the json object with LOGIN identifier and username and password
         /// </summary>
@@ -72,7 +73,7 @@ namespace Util
             return getName(bytes, 2, bytes.Length - 2);
         }
 
-        private static string getName(byte[] bytes , int offset, int lenght)
+        private static string getName(byte[] bytes, int offset, int lenght)
         {
             byte[] nameArray = new byte[lenght];
             Array.Copy(bytes, offset, nameArray, 0, lenght);
@@ -242,6 +243,12 @@ namespace Util
             return bytes[4] == 0x05;
         }
 
+        public static bool IsHistoricBikeData(byte[] bytes)
+        {
+            if (bytes.Length <= 5) throw new ArgumentException("bytes too short");
+            return bytes[4] == 0x06;
+        }
+
 
         /// <summary>
         /// constructs a message with the payload, messageId and clientId
@@ -286,17 +293,16 @@ namespace Util
 
         public static byte[] GetRawBPMDataDoctor(byte[] payload, string username)
         {
-            return GetRawDataDoctor(payload,username,0x05);
+            return GetRawDataDoctor(payload, username, 0x05);
         }
 
         private static byte[] GetRawDataDoctor(byte[] payload, string username, byte messageID)
         {
-            Debug.WriteLine(BitConverter.ToString(Encoding.ASCII.GetBytes(username)));
             byte[] nameArray = Encoding.ASCII.GetBytes(username);
             byte[] total = new byte[nameArray.Length + payload.Length];
             Array.Copy(payload, 0, total, 0, payload.Length);
-            Array.Copy(nameArray,0,total,payload.Length,nameArray.Length);
+            Array.Copy(nameArray, 0, total, payload.Length, nameArray.Length);
-            return getMessage(total,messageID);
+            return getMessage(total, messageID);
 
         }
         /// <summary>
@@ -344,7 +350,7 @@ namespace Util
         /// <param name="user">the username to set the resistance of.</param>
         /// <param name="mResistance">the resistance value to set</param>
         /// <returns>a byte array containing a json messsage to set the user's resistance, using our protocol.</returns>
-        public static byte[] getSetResistanceJson(string user,float mResistance)
+        public static byte[] getSetResistanceJson(string user, float mResistance)
         {
             dynamic data = new
             {
@@ -415,7 +421,6 @@ namespace Util
         /// <returns>the response of the message, so wether it was successful or not.</returns>
         public static bool getResistanceFromResponseJson(byte[] json)
         {
-            Debug.WriteLine("got message " + Encoding.ASCII.GetString(json));
             return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.worked;
         }
 
@@ -472,6 +477,32 @@ namespace Util
             return data;
         }
 
+        public static byte[] GetGetFileMessage(string mUsername)
+        {
+            if (mUsername == null)
+            {
+                throw new ArgumentNullException("username null");
+            }
+            dynamic data = new
+            {
+                username = mUsername,
+            };
+            return getJsonMessage(GET_FILE, data);
+        }
 
+        public static string GetUsernameFromGetFileBytes(byte[] json)
+        {
+            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.username;
+        }
+
+        public static string GetDateFromGetFileBytes(byte[] json)
+        {
+            return ((string)((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.dateTime);
+        }
+
+        public static byte[] GetFileMessage(byte[] file)
+        {
+            return getMessage(file, 0x06);
+        }
     }
 }

Server/Client.cs

@@ -129,7 +129,8 @@ namespace Server
                         break;
                     case DataParser.START_SESSION:
                         this.communication.StartSessionUser(DataParser.getUsernameFromJson(payloadbytes));
-                        this.timer.Start();
+                        if (communication.Doctor != this)
+                            this.timer.Start();
                         break;
                     case DataParser.STOP_SESSION:
                         this.communication.StopSessionUser(DataParser.getUsernameFromJson(payloadbytes));
@@ -147,6 +148,9 @@ namespace Server
                     case DataParser.MESSAGE:
                         communication.SendMessageToClient(DataParser.getUsernameFromJson(payloadbytes), message);
                         break;
+                    case DataParser.GET_FILE:
+                        getClientBikeData(payloadbytes);
+                        break;
                     default:
                         Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}");
                         break;
@@ -166,7 +170,9 @@ namespace Server
                     Array.Copy(this.BikeDataBuffer, 0, this.BikeDataBuffer, 8, 8);
                     Array.Copy(payloadbytes, 0, this.BikeDataBuffer, 0, 8);
                 }
-                //this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(payloadbytes, this.username));
+                if (this.username != null)
+                this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(payloadbytes, this.username));
+
             }
             else if (DataParser.isRawDataBPMServer(message))
             {
@@ -176,11 +182,39 @@ namespace Server
                 {
                     Array.Copy(payloadbytes, 0, this.BPMDataBuffer, 0, 2);
                 }
-                //this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(payloadbytes, this.username));
+                if (this.username != null)
+                this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(payloadbytes, this.username));
             }
 
         }
 
+        private void getClientBikeData(byte[] payloadbytes)
+        {
+            //ugly
+            //get the raw bike data of the user with the specified username
+            string username = DataParser.GetUsernameFromGetFileBytes(payloadbytes);
+            string path = Directory.GetCurrentDirectory() + "/" + username + "/";
+            string bytes = string.Empty;
+            StringBuilder sb = new StringBuilder(bytes);
+            try
+            {
+                DirectoryInfo dirInf = new DirectoryInfo(Directory.GetCurrentDirectory() + "/" + username + "/");
+                DirectoryInfo[] directoryInfos = dirInf.GetDirectories();
+                DirectoryInfo latest = directoryInfos[directoryInfos.Length - 1];
+                path = path + latest.Name + "/rawBike.bin";
+                FileInfo fi = new FileInfo(path);
+
+                if ((int)fi.Length >= 1024) return;
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine("[SERVER CLIENT] excetion while trying to get raw bike data: " + e.Message);
+            }
+
+            Debug.WriteLine("[SERVER CLIENT] about to send " + sb.ToString());
+            communication.Doctor.sendMessage(DataParser.GetFileMessage(File.ReadAllBytes(path)));
+        }
+
         private bool handleLogin(byte[] payloadbytes)
         {
             string username;
@@ -286,6 +320,7 @@ namespace Server
                 this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(this.BPMDataBuffer, this.username));
             }
             this.timer.Start();
+            Debug.WriteLine("[serverclient] send bike and bpm data timer");
         }
     }
 }