felixh/polychat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

remove MSG.cs, merge content from MSG.cs and ChatMessage.cs, refactor code

Browse Source
This commit is contained in:
Felix Hartmann (PEA3-Fe-FI)
2021-09-21 09:28:29 +02:00
parent 5d69842ec0
commit d42acbc90e
6 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PolyChat/Models/Client.cs
View File

@@ -24,7 +24,7 @@ namespace PolyChat.Models
{
private SocketIOClient connection;
public Boolean isConnected = false;
private List<MSG> msgStack = new List<MSG>();
private List<ChatMessage> msgStack = new List<ChatMessage>();
private Boolean active = true;
private String ip;
@@ -49,7 +49,7 @@ namespace PolyChat.Models
new Thread(() =>
{
//create msg
MSG msg = new MSG(sender, Controller.ip, chatMessage, timestamp);
ChatMessage msg = new ChatMessage(timestamp, chatMessage, false, sender, Controller.ip);
//convert msg
String petJson = JsonNet.Serialize(msg);
@@ -78,7 +78,7 @@ namespace PolyChat.Models
{
connection.On(SendCode.Message.ToString(), (Data) =>
{
MSG pet = JsonNet.Deserialize<MSG>(BitConverter.ToString(Data[0].ToObject<byte[]>()));
ChatMessage pet = JsonNet.Deserialize<ChatMessage>(BitConverter.ToString(Data[0].ToObject<byte[]>()));
//TODO: send message to GUI
});
connection.On(SendCode.Command.ToString(), (Data) =>