ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat

Browse Source 
# Conflicts:
#	ChatController/LoginControl.xaml.cs
This commit is contained in:
Christian
2020-04-02 10:17:57 +02:00
parent a4c5d9945e 38ccd379bb
commit 1397d13d70
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChatController/HauptKlassen/Chat.cs
View File

@@ -3,6 +3,7 @@ using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
@@ -115,6 +116,7 @@ namespace ChatController.HauptKlassen
if (!string.IsNullOrEmpty(serverResponse))
{
Debug.WriteLine(serverResponse);
_UserMessages = JsonConvert.DeserializeObject<UserMessages>(serverResponse);
if (_UserMessages.Response.HasMorePages)
@@ -473,7 +475,7 @@ namespace ChatController.HauptKlassen
filename = filename.Replace(".bmp", ".jpg");
Messages.Add(new ChatMessage(message.UserName, filename, sendTime, true, bitmapImage, pFile, filename, pGroupId));
Messages.Add(new ChatMessage(message.User_Name, filename, sendTime, true, bitmapImage, pFile, filename, pGroupId));
}
}
@@ -482,7 +484,7 @@ namespace ChatController.HauptKlassen
}
else
{
Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFile), sendTime, message.SmallerImage, true, pFile, pGroupId));
Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFile), sendTime, message.SmallerImage, true, pFile, pGroupId));
}
}
@@ -515,11 +517,11 @@ namespace ChatController.HauptKlassen
memoryStream.Close();
ImageSource logo = bitmapImage;
Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFileName), sendtime, true, logo, pFileName, Path.GetFileName(pFileName), pGroupId));
Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, true, logo, pFileName, Path.GetFileName(pFileName), pGroupId));
}
else
{
Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFileName), sendtime, message.SmallerImage, true, pFileName, pGroupId));
Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, message.SmallerImage, true, pFileName, pGroupId));
}
}
@@ -1293,12 +1295,12 @@ namespace ChatController.HauptKlassen
if (!string.IsNullOrEmpty(message.File))
{
Messages.Add(Constants.ImageFileExtensions.Contains(Path.GetExtension(message.File).ToUpperInvariant()) ?
new ChatMessage(message.UserName, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.SmallerImage), message.File, message.OriginalFilename, message.GroupId) :
new ChatMessage(message.UserName, messageText, formattedTime, message.SmallerImage, isLoggedInUsersMessage, message.File, message.GroupId));
new ChatMessage(message.User_Name, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.SmallerImage), message.File, message.OriginalFilename, message.GroupId) :
new ChatMessage(message.User_Name, messageText, formattedTime, message.SmallerImage, isLoggedInUsersMessage, message.File, message.GroupId));
}
else
{
Messages.Add(new ChatMessage(message.UserName, message.Text, formattedTime, isLoggedInUsersMessage, message.GroupId));
Messages.Add(new ChatMessage(message.User_Name, message.Text, formattedTime, isLoggedInUsersMessage, message.GroupId));
}
}
}

4
ChatController/LoginKlassen/UserMessages.cs
View File

@@ -28,8 +28,8 @@
public LastMessageTimeStamp Timestamp { get; set; }
public long CreatedAt { get; set; }
public long UserId { get; set; }
public string UserName { get; set; }
public string UserPicture { get; set; }
public string User_Name { get; set; }
public string User_Picture { get; set; }
public long GroupId { get; set; }
}
}