sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] fixed handling client disconnect

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-21 22:54:37 +02:00
parent e8a72e164f
commit c150bf3611
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Server/Models/ServerCommunication.cs
View File

@@ -16,6 +16,7 @@ namespace Server.Models
public bool Started = false; public bool Started = false;
public List<Lobby> lobbies; public List<Lobby> lobbies;
private Dictionary<Lobby, List<ServerClient>> serverClientsInlobbies; private Dictionary<Lobby, List<ServerClient>> serverClientsInlobbies;
internal Action DisconnectClientAction;
public Action newClientAction; public Action newClientAction;
@@ -99,8 +100,22 @@ namespace Server.Models
public void ServerClientDisconnect(ServerClient serverClient) public void ServerClientDisconnect(ServerClient serverClient)
{ {
// remove from serverclientsinlobbies Debug.WriteLine("[SERVERCOMM] handling disconnect");
// send leave message DisconnectClientAction?.Invoke();
int id = -1;
foreach (Lobby l in serverClientsInlobbies.Keys)
{
if (serverClientsInlobbies[l].Contains(serverClient))
{
id = l.ID;
}break;
}
if (id != -1)
{
LeaveLobby(serverClient.User, id);
SendToAllExcept(serverClient, JSONConvert.ConstructLobbyLeaveMessage(id));
}
} }
public void SendToAllExcept(string username, byte[] message) public void SendToAllExcept(string username, byte[] message)
@@ -111,6 +126,14 @@ namespace Server.Models
} }
} }
public void SendToAllExcept(ServerClient sc, byte[] message)
{
foreach (ServerClient s in serverClients)
{
if (s != sc) s.sendMessage(message);
}
}
public void SendToLobby(Lobby lobby, byte[] message) public void SendToLobby(Lobby lobby, byte[] message)
{ {
foreach (Lobby l in lobbies) foreach (Lobby l in lobbies)

4
Server/ViewModels/MainViewModel.cs
View File

@@ -33,6 +33,10 @@ namespace Server.ViewModels
{ {
InformationModel.ClientsConnected++; InformationModel.ClientsConnected++;
}; };
serverCommunication.DisconnectClientAction = () =>
{
InformationModel.ClientsConnected--;
};
//BitmapImage onlineImg = new BitmapImage(new Uri(@"/img/online.png",UriKind.Relative)); //BitmapImage onlineImg = new BitmapImage(new Uri(@"/img/online.png",UriKind.Relative));
//BitmapImage offlineImg = new BitmapImage(new Uri(@"/img/offline.png", UriKind.Relative)); //BitmapImage offlineImg = new BitmapImage(new Uri(@"/img/offline.png", UriKind.Relative));