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

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +82 -26
6 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d599cfcd2 - Show all commits

4
ClientApp/Views/LoginView.xaml
View File

@@ -19,9 +19,7 @@
<Label Content="Password" HorizontalContentAlignment="Center"/> <Label Content="Password" HorizontalContentAlignment="Center"/>
<PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/> <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"/> <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> </StackPanel>
</DockPanel> </DockPanel>
</Page> </Page>

17
DoctorApp/ViewModels/ClientInfoViewModel.cs
View File

@@ -41,6 +41,8 @@ namespace DoctorApp.ViewModels
public ICommand SetResistance { get; set; } public ICommand SetResistance { get; set; }
public ICommand SaveHistoricData { get; set; }
public MainWindowViewModel MainWindowViewModel { get; set; } public MainWindowViewModel MainWindowViewModel { get; set; }
private Client client; private Client client;
@@ -81,13 +83,18 @@ namespace DoctorApp.ViewModels
PatientInfo.Resistance = float.Parse(((TextBox)parameter).Text); PatientInfo.Resistance = float.Parse(((TextBox)parameter).Text);
}); });
this.SaveHistoricData = new RelayCommand<object>((parameter) =>
{
this.client.sendMessage(DataParser.GetGetFileMessage(PatientInfo.Username, DateTime.Now));
});
} }
public void BPMData(byte [] bytes) public void BPMData(byte[] bytes)
{ {
//TODO //TODO
//Parsen van de data you fuck //Parsen van de data you fuck
if(bytes[0] == 0x00) if (bytes[0] == 0x00)
{ {
} }
@@ -95,13 +102,13 @@ namespace DoctorApp.ViewModels
{ {
PatientInfo.BPM = bytes[1]; PatientInfo.BPM = bytes[1];
if (MySelectedItem == "BPM") if (MySelectedItem == "BPM")
{ {
Chart.NewValue(PatientInfo.BPM); Chart.NewValue(PatientInfo.BPM);
} }
} }
} }
public void BikeData(byte[] bytes) public void BikeData(byte[] bytes)

24
DoctorApp/Views/ClientInfoView.xaml
View File

@@ -18,16 +18,20 @@
<RowDefinition Height="180*"/> <RowDefinition Height="180*"/>
<RowDefinition Height="180*"/> <RowDefinition Height="180*"/>
</Grid.RowDefinitions> </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> <StackPanel.Resources>
<Style TargetType="{x:Type DockPanel}"> <Style TargetType="{x:Type DockPanel}">
<Setter Property="Margin" Value="0,20,0,0"/> <Setter Property="Margin" Value="0,20,0,0"/>

2
DoctorApp/Views/MainWindow.xaml
View File

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

42
Hashing/DataParser.cs
View File

@@ -23,6 +23,7 @@ namespace Util
public const string DISCONNECT = "DISCONNECT"; public const string DISCONNECT = "DISCONNECT";
public const string LOGIN_DOCTOR = "LOGIN DOCTOR"; public const string LOGIN_DOCTOR = "LOGIN DOCTOR";
public const string MESSAGE = "MESSAGE"; public const string MESSAGE = "MESSAGE";
public const string GET_FILE = "GET FILE";
/// <summary> /// <summary>
/// makes the json object with LOGIN identifier and username and password /// makes the json object with LOGIN identifier and username and password
/// </summary> /// </summary>
@@ -72,7 +73,7 @@ namespace Util
return getName(bytes, 2, bytes.Length - 2); 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]; byte[] nameArray = new byte[lenght];
Array.Copy(bytes, offset, nameArray, 0, lenght); Array.Copy(bytes, offset, nameArray, 0, lenght);
@@ -286,7 +287,7 @@ namespace Util
public static byte[] GetRawBPMDataDoctor(byte[] payload, string username) 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) private static byte[] GetRawDataDoctor(byte[] payload, string username, byte messageID)
@@ -295,8 +296,8 @@ namespace Util
byte[] nameArray = Encoding.ASCII.GetBytes(username); byte[] nameArray = Encoding.ASCII.GetBytes(username);
byte[] total = new byte[nameArray.Length + payload.Length]; byte[] total = new byte[nameArray.Length + payload.Length];
Array.Copy(payload, 0, total, 0, 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> /// <summary>
@@ -337,14 +338,14 @@ namespace Util
}; };
return getJsonMessage(STOP_SESSION, data); return getJsonMessage(STOP_SESSION, data);
} }
/// <summary> /// <summary>
/// gets the message to set the resistance of the given user with the given resistance. /// gets the message to set the resistance of the given user with the given resistance.
/// </summary> /// </summary>
/// <param name="user">the username to set the resistance of.</param> /// <param name="user">the username to set the resistance of.</param>
/// <param name="mResistance">the resistance value to set</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> /// <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 dynamic data = new
{ {
@@ -436,7 +437,7 @@ namespace Util
/// <returns>the chat message in the json message</returns> /// <returns>the chat message in the json message</returns>
public static string getChatMessageFromJson(byte[] json) public static string getChatMessageFromJson(byte[] json)
{ {
return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.chat; return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.chat;
} }
/// <summary> /// <summary>
@@ -472,6 +473,33 @@ namespace Util
return data; return data;
} }
public static byte[] GetGetFileMessage(string mUsername, DateTime mDateTime)
{
if (mUsername == null)
{
throw new ArgumentNullException("username null");
}
dynamic data = new
{
username = mUsername,
dateTime = mDateTime.ToString("yyyy-MM-dd HH-mm-ss")
};
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, 0x04);
}
} }
} }

19
Server/Client.cs
View File

@@ -147,6 +147,25 @@ namespace Server
case DataParser.MESSAGE: case DataParser.MESSAGE:
communication.SendMessageToClient(DataParser.getUsernameFromJson(payloadbytes), message); communication.SendMessageToClient(DataParser.getUsernameFromJson(payloadbytes), message);
break; break;
case DataParser.GET_FILE:
//ugly
string username = DataParser.GetUsernameFromGetFileBytes(payloadbytes);
string path = Directory.GetCurrentDirectory() + "/" + username + "/" + DataParser.GetDateFromGetFileBytes(payloadbytes) + "/rawBike.bin";
int length = Int32.MaxValue;
try
{
FileInfo fi = new FileInfo(path);
length = (int)fi.Length;
}
catch
{
Console.WriteLine("couldn't find file " + path);
}
if (length > 10240)
break;
communication.SendMessageToClient(username, DataParser.GetFileMessage(File.ReadAllBytes(path)));
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;