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 +5 -3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a238d9207 - Show all commits

4
DoctorApp/Utils/Client.cs
View File

@@ -111,10 +111,10 @@ namespace DoctorApp.Utils
Console.WriteLine("Set resistance identifier"); Console.WriteLine("Set resistance identifier");
break; break;
case DataParser.NEW_CONNECTION: case DataParser.NEW_CONNECTION:
this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes)); this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromJson(payloadbytes));
break; break;
case DataParser.DISCONNECT: case DataParser.DISCONNECT:
this.MainViewModel.DisconnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes)); this.MainViewModel.DisconnectedUser(DataParser.getUsernameFromJson(payloadbytes));
break; 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)}");

2
DoctorApp/Views/MainView.xaml
View File

@@ -11,7 +11,7 @@
<TabControl TabStripPlacement="Left" ItemsSource="{Binding Tabs}" SelectedItem="{Binding Selected}"> <TabControl TabStripPlacement="Left" ItemsSource="{Binding Tabs}" SelectedItem="{Binding Selected}">
<TabControl.ItemTemplate> <TabControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Username}"/> <TextBlock Text="{Binding PatientInfo.Username}"/>
</DataTemplate> </DataTemplate>
</TabControl.ItemTemplate> </TabControl.ItemTemplate>
<TabControl.ContentTemplate> <TabControl.ContentTemplate>

2
Server/Client.cs
View File

@@ -65,6 +65,8 @@ namespace Server
} }
} }
if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead))
return;
this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null); this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null);
} }