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

[MISC] tried to send the message to the current lobby, didn't work.

Browse Source
This commit is contained in:
Dogukan
2020-10-21 20:43:28 +02:00
parent 74f8e868f6
commit a4e45b1a6b
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Client/Client.cs
View File

@@ -82,8 +82,9 @@ namespace Client
(string, string) combo = JSONConvert.GetUsernameAndMessage(payload); (string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
string textUsername = combo.Item1; string textUsername = combo.Item1;
string textMsg = combo.Item2; string textMsg = combo.Item2;
//TODO display username and message in chat window
//TODO display username and message in chat window
Debug.WriteLine("[CLIENT] INCOMING MESSAGE!");
Debug.WriteLine("[CLIENT] User name: {0}\t User message: {1}", textUsername, textMsg); Debug.WriteLine("[CLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
break; break;

13
Client/ClientData.cs
View File

@@ -30,6 +30,7 @@ namespace Client
private User _user; private User _user;
private Client _client; private Client _client;
private Lobby _lobby; private Lobby _lobby;
private string _message;
private ClientData() private ClientData()
{ {
@@ -55,5 +56,17 @@ namespace Client
set { _lobby = value; } set { _lobby = value; }
} }
public String Message
{
get
{
return _message;
}
set
{
_message = value;
}
}
} }
} }

20
Client/ViewModels/ViewModelGame.cs
View File

@@ -33,15 +33,17 @@ namespace Client.ViewModels
public ViewModelGame() public ViewModelGame()
{ {
//if (_payload == null) if (_payload == null)
//{ {
// _message = ""; _message = "";
//}
//else }
//{ else
// _message = _payload.message; {
// _username = _payload.username; //_message = data.Message;
//} //_username = data.User.Username;
//Messages.Add($"{data.User.Username}: {Message}");
}
OnKeyDown = new RelayCommand(ChatBox_KeyDown); OnKeyDown = new RelayCommand(ChatBox_KeyDown);
} }

10
Server/Models/ServerClient.cs
View File

@@ -120,15 +120,9 @@ namespace Server.Models
Debug.WriteLine("[SERVERCLIENT] User name: {0}\t User message: {1}", textUsername, textMsg); Debug.WriteLine("[SERVERCLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
dynamic dataPacket = new
{
username = textUsername,
message = textMsg
};
// todo handle sending to all except this user the username and message to display in chat // todo handle sending to all except this user the username and message to display in chat
//serverCom.SendToAllExcept(); serverCom.SendToLobby(User.Lobby,payload);
serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, dataPacket)); Debug.WriteLine("Payload has been sent!");
break; break;
case JSONConvert.LOBBY: case JSONConvert.LOBBY:

1
SharedClientServer/JSONConvert.cs
View File

@@ -24,7 +24,6 @@ namespace SharedClientServer
public static (string,string) GetUsernameAndMessage(byte[] json) public static (string,string) GetUsernameAndMessage(byte[] json)
{ {
string msg = Encoding.ASCII.GetString(json); string msg = Encoding.ASCII.GetString(json);
Debug.WriteLine("Sent data: {0}", msg);
dynamic payload = JsonConvert.DeserializeObject(msg); dynamic payload = JsonConvert.DeserializeObject(msg);
return (payload.username, payload.message); return (payload.username, payload.message);