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

Benutzername und Profilfoto werden wieder angezeigt.

Browse Source
This commit is contained in:
Lyndon Jetten
2020-03-17 13:37:19 +01:00
parent 399e5d7636
commit 38ccd379bb
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChatController/ChatMainControl.xaml
View File

@@ -229,7 +229,7 @@
<ListBox x:Name="ChatListBox" HorizontalAlignment="Stretch" ScrollViewer.CanContentScroll="False" VerticalAlignment="Stretch" Grid.Row="1" VirtualizingStackPanel.IsVirtualizing="True" BorderThickness="0"
VirtualizingStackPanel.VirtualizationMode="Recycling" SelectionMode="Extended" MouseDoubleClick="Chat_OnMouseDoubleClick" ScrollViewer.ScrollChanged="Chat_OnScrollChanged" Background="{StaticResource LightBackColor}"
ContextMenuOpening="Chat_OnContextMenuOpening" Padding="20">
<ListBox.ItemContainerStyle>
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="HorizontalAlignment" Value="{Binding Posi}" />
</Style>
@@ -237,10 +237,10 @@
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel>
<Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}" >
<DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" >
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding ChatVisibility}" >
<TextBlock VerticalAlignment="Center" Text="{Binding UserMessage}" MinWidth="0" MaxWidth="500" TextWrapping="Wrap" FontSize="14"/>
<Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}">
<DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}">
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding ChatVisibility}">
<TextBlock VerticalAlignment="Center" Text="{Binding UserMessage}" MinWidth="0" MaxWidth="500" TextWrapping="Wrap" FontSize="14"/>
</StackPanel>
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding HyperlinkVisibility}" >
<TextBlock>
@@ -267,11 +267,11 @@
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}" FontSize="14"/>
</StackPanel>
</DockPanel>
<StackPanel DockPanel.Dock="Left" Margin="0,0,0,0" >
<TextBlock Text="{Binding UserTimeStringLeft}" MaxWidth="350" FontSize="11" HorizontalAlignment="Left" TextAlignment="Left" VerticalAlignment="Center" Foreground="{Binding FarbeRechtsColor}" />
<StackPanel DockPanel.Dock="Left" Margin="0,0,0,0">
<TextBlock Text="{Binding UserTimeStringLeft}" MaxWidth="350" FontSize="11" HorizontalAlignment="Left" TextAlignment="Left" VerticalAlignment="Center" Foreground="{Binding FarbeRechtsColor}" />
</StackPanel>
<StackPanel DockPanel.Dock="Right" Margin="5,0,0,5" >
<TextBlock Text="{Binding UserTimeStringRight}" MaxWidth="350" FontSize="11" HorizontalAlignment="Right" TextAlignment="Right" VerticalAlignment="Center" Foreground="{Binding FarbeRechtsColor}" />
<StackPanel DockPanel.Dock="Right" Margin="5,0,0,5">
<TextBlock Text="{Binding UserTimeStringRight}" MaxWidth="350" FontSize="11" HorizontalAlignment="Right" TextAlignment="Right" VerticalAlignment="Center" Foreground="{Binding FarbeRechtsColor}" />
</StackPanel>
</DockPanel>
</Border>

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/LoginControl.xaml.cs
View File

@@ -44,8 +44,8 @@ namespace ChatController
lblVersion.Content = $"Version: {_version}";
#if DEBUG
TextBoxBenutzerName.Text = "MuellerL";
TextBoxPasswort.Password = "12345";
TextBoxBenutzerName.Text = "JettenL";
TextBoxPasswort.Password = "n8-yR+3Q=6nX#";
#endif
}

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; }
}
}