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

Abruf der Nachrichten asynchron gemacht

Browse Source 
Bilder werden im Cache gespeichert
This commit is contained in:
Lyndon Jetten
2021-07-14 19:33:50 +02:00
parent f707884585
commit b9b9caec58
14 changed files with 1003 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChatController/ChatController.csproj
View File

@@ -37,16 +37,13 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\libs\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp">
<HintPath>..\libs\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\PrototypChat\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -54,10 +51,6 @@
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
@@ -109,6 +102,7 @@
<Compile Include="Utilities\OwnChatEnums.cs" />
<Compile Include="Utilities\SyncFileInfoStruct.cs" />
<Compile Include="Utilities\Utils.cs" />
<Compile Include="Utilities\WpfUtils.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="ChatEmojiiControl.xaml">
@@ -150,6 +144,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="ownchat_favicon.ico" />
<Resource Include="Ressourcen\ownchat_image_placeholder.png" />
<Resource Include="Ressourcen\warning-exclamation-mark.png" />
<None Include="packages.config" />
<None Include="Resources\oC-favico_NewMessage.ico" />

142
ChatController/ChatKlassen/ChatMessage.cs
View File

@@ -9,8 +9,10 @@ using static System.Windows.HorizontalAlignment;
namespace ChatController.ChatKlassen
{
public class ChatMessage
public class ChatMessage : INotifyPropertyChanged
{
public long MessageId { get; set; }
public int TimeStringMaxWidth => IsSeparator ? int.MaxValue : 350;
public int MessageMaxWidth => IsSeparator ? int.MaxValue : 500;
@@ -32,67 +34,127 @@ namespace ChatController.ChatKlassen
}
//Chat-Ansicht
public ChatMessage(string username, string message, DateTime sendtime, bool isme, long pGroupId, long fileSize)
public ChatMessage(string username, string message, DateTime sendtime, bool isme, long groupId, long fileSize, long messageId)
{
MessageId = messageId;
Id = Guid.NewGuid();
Username = username;
UserMessage = message;
SendTime = sendtime;
IsMyMessage = isme;
GroupId = pGroupId;
GroupId = groupId;
MessageType = IsHyperlink(message) ? ChatMessageType.Hyperlink : ChatMessageType.Message;
}
// Image-Ansicht
public ChatMessage(string username, string message, DateTime sendtime, bool isme, ImageSource image, string originalImage, string imageName, long pGroupId, long fileSize)
public ChatMessage(string username, string message, DateTime sendtime, bool isme, string filePath, string originalImage, string imageName, long groupId, long fileSize, long messageId)
{
PicturePlaceholderHeight = Utils.GetHeightFromThumbnailUri(filePath);
PictureSource = Utils.GetPicturePlaceholder();
MessageId = messageId;
Id = Guid.NewGuid();
Username = username;
UserMessage = message;
SendTime = sendtime;
ImageSources = image;
IsMyMessage = isme;
OriginalImage = originalImage;
OriginalImageName = imageName;
GroupId = pGroupId;
GroupId = groupId;
MessageType = ChatMessageType.Image;
Utils.DownloadImageAsync(filePath, $"group-{groupId}", CacheCategory.Thumbnail, imageSource =>
{
PictureSource = imageSource;
});
}
//Dokumenten-Ansicht
public ChatMessage(string pUsername, string pMessageText, DateTime pSendTime, string pSmallerImagePath, bool pIsLoggedInUsersMessage, string pUrl, long pGroupId, long fileSize)
public ChatMessage(string username, string message, DateTime sendtime, string thumbnailPath, bool isme, string filePath, long groupId, long fileSize, long messageId)
{
ThumbnailPlaceholderHeight = Utils.GetHeightFromThumbnailUri(thumbnailPath);
Thumbnail = Utils.GetPicturePlaceholder();
MessageId = messageId;
Id = Guid.NewGuid();
Username = pUsername;
UserMessage = pMessageText;
SendTime = pSendTime;
IsMyMessage = pIsLoggedInUsersMessage;
Username = username;
UserMessage = message;
SendTime = sendtime;
IsMyMessage = isme;
FilePath = pUrl;
var cache = OwnChatCache.GetInstance();
var imgSrc = cache.GetImageSourceFromCache($"group-{pGroupId}");
if(imgSrc == null)
{
imgSrc = Utils.CreateImageSourceFromPath(pSmallerImagePath);
}
Thumbnail = imgSrc;
FilePath = filePath;
GroupId = pGroupId;
Utils.DownloadImageAsync(thumbnailPath, $"group-{groupId}", CacheCategory.Thumbnail, imageSource =>
{
Thumbnail = imageSource;
});
GroupId = groupId;
MessageType = ChatMessageType.Document;
}
// Mit Logo
public ChatMessage(string username, string message, DateTime sendtime, bool isme, ImageSource logo, string originalImage, string imageName, long groupId, long fileSize, long messageId)
{
MessageId = messageId;
Id = Guid.NewGuid();
Username = username;
UserMessage = message;
SendTime = sendtime;
IsMyMessage = isme;
OriginalImage = originalImage;
OriginalImageName = imageName;
GroupId = groupId;
MessageType = ChatMessageType.Image;
PictureSource = logo;
}
public ChatMessageType MessageType { get; }
public ImageSource Thumbnail { get; }
private ImageSource _Thumbnail;
public ImageSource Thumbnail
{
get => _Thumbnail;
set
{
if(!Equals(_Thumbnail, value))
{
_Thumbnail = value;
OnPropertyChanged(nameof(Thumbnail));
}
}
}
private int _ThumbnailPlaceholderHeight;
public int ThumbnailPlaceholderHeight
{
get => _ThumbnailPlaceholderHeight;
set
{
if(!Equals(_ThumbnailPlaceholderHeight, value))
{
_ThumbnailPlaceholderHeight = value;
OnPropertyChanged(nameof(ThumbnailPlaceholderHeight));
}
}
}
private static readonly Regex _UrlRegex = new Regex(@"(?#Protocol)^(http(?:s?)\:(\/\/|\\\\)|(w){3}(2|3)?\.{1})(?#Subdomains)(?:(?:[-\w]+\.)+(?#TopLevel Domains)(?:com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|[a-z]{2}))(?#Port)(?::[\d]{1,5})?(?#Directories)(?:(?:(?:/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|/)+|\?|#)?(?#Query)(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&amp;(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?#Anchor)(?:#(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)?");
@@ -171,7 +233,33 @@ namespace ChatController.ChatKlassen
public Visibility DokumentVisibility => MessageType == ChatMessageType.Document ? Visibility.Visible : Visibility.Collapsed;
public ImageSource ImageSources { get; }
private ImageSource _PictureSource;
public ImageSource PictureSource
{
get => _PictureSource;
set
{
if(!Equals(_PictureSource, value))
{
_PictureSource = value;
OnPropertyChanged(nameof(PictureSource));
}
}
}
private int _PicturePlaceholderHeight;
public int PicturePlaceholderHeight
{
get => _PicturePlaceholderHeight;
set
{
if (!Equals(_PicturePlaceholderHeight, value))
{
_PicturePlaceholderHeight = value;
OnPropertyChanged(nameof(PicturePlaceholderHeight));
}
}
}
public object FilePath { get; }
@@ -217,7 +305,7 @@ namespace ChatController.ChatKlassen
return SendTime == message.SendTime;
}
return message.Id.Equals(Id);
return MessageId.Equals(message.MessageId);
}
return false;

29
ChatController/ChatKlassen/Contact.cs
View File

@@ -1,8 +1,8 @@
using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Media;
using ChatController.LoginKlassen;
using ChatController.Utilities;
using Brush = System.Windows.Media.Brush;
namespace ChatController.ChatKlassen
@@ -60,7 +60,19 @@ namespace ChatController.ChatKlassen
}
}
public ImageSource Image { get; }
private ImageSource _Image;
public ImageSource Image
{
get => _Image;
set
{
if(!Equals(_Image, value))
{
_Image = value;
OnPropertyChanged(nameof(Image));
}
}
}
public DateTime TimeStamp { get; set; }
@@ -70,9 +82,7 @@ namespace ChatController.ChatKlassen
public bool IsChatMessageInputGridVisible { get; }
public Bitmap ProfilePicture { get; }
public Contact(string pName, GroupLatestMessage pLatestMessage, DateTime pTimeStamp, int pGroupId, string pUserIdManage, bool pOnlyEmployees, int pUserCount, bool isChatMessageInputGridVisible, string accentColorBrushString, Bitmap profilePicture, ImageSource image)
public Contact(string pName, GroupLatestMessage pLatestMessage, DateTime pTimeStamp, int pGroupId, string pUserIdManage, bool pOnlyEmployees, int pUserCount, bool isChatMessageInputGridVisible, string accentColorBrushString, string profilePicturePath, string key)
{
Name = pName;
ReceivedMessage = pLatestMessage;
@@ -81,8 +91,6 @@ namespace ChatController.ChatKlassen
UserIdManage = pUserIdManage;
HasUnreadMessages = false;
ProfilePicture = profilePicture;
IsChatMessageInputGridVisible = isChatMessageInputGridVisible;
if(accentColorBrushString == null)
@@ -103,7 +111,10 @@ namespace ChatController.ChatKlassen
AccentColorBrush = new BrushConverter().ConvertFromString($"#{accentColorBrushString}") as SolidColorBrush;
Image = image;
Utils.DownloadProfilePictureAsync(profilePicturePath, key, delegate(ImageSource imageSource)
{
Image = imageSource;
});
}
public override bool Equals(object obj)
@@ -122,7 +133,6 @@ namespace ChatController.ChatKlassen
return Name == y.Name &&
IsNewMessage == y.IsNewMessage &&
Equals(ProfilePicture, y.ProfilePicture) &&
TimeStamp.Equals(y.TimeStamp) &&
GroupId == y.GroupId &&
UserIdManage == y.UserIdManage &&
@@ -138,7 +148,6 @@ namespace ChatController.ChatKlassen
{
var hashCode = Name != null ? Name.GetHashCode() : 0;
hashCode = (hashCode * 397) ^ (ProfilePicture != null ? ProfilePicture.GetHashCode() : 0);
hashCode = (hashCode * 397) ^ GroupId;
hashCode = (hashCode * 397) ^ (UserIdManage != null ? UserIdManage.GetHashCode() : 0);
hashCode = (hashCode * 397) ^ IsChatMessageInputGridVisible.GetHashCode();

39
ChatController/ChatMainControl.xaml
View File

@@ -89,7 +89,7 @@
</Grid.ColumnDefinitions>
<Ellipse Grid.Column="1" Width='32' Height='32' RenderOptions.BitmapScalingMode="HighQuality">
<Ellipse.Fill>
<ImageBrush ImageSource='{Binding Image}' Stretch='UniformToFill' RenderOptions.BitmapScalingMode="HighQuality" />
<ImageBrush ImageSource='{Binding Image, UpdateSourceTrigger=PropertyChanged}' Stretch='UniformToFill' RenderOptions.BitmapScalingMode="HighQuality" />
</Ellipse.Fill>
</Ellipse>
<Grid Grid.Column="3" >
@@ -148,10 +148,16 @@
</ControlTemplate.Triggers>
</ControlTemplate>
<!-- /Gruppensuchtemplate -->
<Style TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" />
<Setter Property="Width" Value="12" />
<Setter Property="Height" Value="40" />
</Style>
</UserControl.Resources>
<Grid x:Name="RootGrid">
<Border x:Name="rootBorder" Background="{StaticResource DarkBackColor}" Padding="0" Margin="0" BorderThickness="0">
<Grid >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250" />
<ColumnDefinition Width="*"/>
@@ -226,11 +232,22 @@
<TextBlock Grid.Column="1" VerticalAlignment="Center" Margin="8" TextWrapping="Wrap" Text="{Binding CurrentContactInformationString}" FontSize="16" Foreground="{Binding CurrencContactInfoForeground}" />
</Grid>
<ListBox x:Name="ChatListBox" ItemsSource="{Binding CurrentChatMessages, UpdateSourceTrigger=PropertyChanged}"
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" d:DataContext="{d:DesignData ChatMessage}">
<ListBox x:Name="ChatListBox"
ItemsSource="{Binding ChatMessages, UpdateSourceTrigger=PropertyChanged}"
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"
d:DataContext="{d:DesignData ChatMessage}">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="HorizontalAlignment" Value="{Binding HorizontalAlignmentValue}" />
@@ -306,7 +323,7 @@
</StackPanel>
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
<StackPanel Orientation="Vertical">
<Image MaxWidth="300" Source="{Binding ImageSources}" x:Name="imgChatMessage" Stretch="UniformToFill"/>
<Image MaxWidth="300" Height="{Binding PicturePlaceholderHeight, UpdateSourceTrigger=PropertyChanged}" Source="{Binding PictureSource, UpdateSourceTrigger=PropertyChanged}" x:Name="imgChatMessage" Stretch="UniformToFill"/>
<TextBlock Text="{Binding UserMessage}" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="14"/>
</StackPanel>
</DockPanel>
@@ -318,7 +335,8 @@
</DockPanel>
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding DokumentVisibility}" >
<StackPanel Orientation="Vertical">
<Image ToolTip="Dokument öffnen" Height="100" Width="150" Source="{Binding Path=Thumbnail}" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
<!-- Platzhalter mit Höhe 100 -->
<Image ToolTip="Dokument öffnen" Height="{Binding ThumbnailPlaceholderHeight, UpdateSourceTrigger=PropertyChanged}" Width="150" Source="{Binding Path=Thumbnail}" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}" FontSize="14"/>
</StackPanel>
</DockPanel>
@@ -351,13 +369,14 @@
Visibility="Visible"
BorderThickness="0"
VerticalContentAlignment="Top"
MinHeight="25" MaxHeight="200"
MinHeight="69" MaxHeight="200"
FontSize="15"
Padding="2"
ToolTip="Schreiben Sie hier eine Nachricht hinein"
Margin="2"
VerticalAlignment="Stretch"
GotFocus="Chatbox_OnGotFocus"
AcceptsReturn="True"
KeyDown="Chatbox_OnKeyDownHandler"
TextChanged="Chatbox_OnTextChanged">
<TextBox.Resources>

427
ChatController/ChatMainControl.xaml.cs
View File

@@ -5,7 +5,6 @@ using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Runtime.CompilerServices;
using System.Text;
using System.Windows;
@@ -24,18 +23,18 @@ using ChatController.HauptKlassen;
using ChatController.LoginKlassen;
using ChatController.Utilities;
using ChatController.Utilities.Extensions;
using Application = System.Windows.Forms.Application;
using Button = System.Windows.Controls.Button;
using Cursors = System.Windows.Input.Cursors;
using DataFormats = System.Windows.DataFormats;
using Application = System.Windows.Forms.Application;
using Button = System.Windows.Controls.Button;
using Cursors = System.Windows.Input.Cursors;
using DataFormats = System.Windows.DataFormats;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MenuItem = System.Windows.Controls.MenuItem;
using MessageBox = System.Windows.MessageBox;
using Orientation = System.Windows.Controls.Orientation;
using Panel = System.Windows.Controls.Panel;
using Path = System.IO.Path;
using ScrollBar = System.Windows.Controls.Primitives.ScrollBar;
using Timer = System.Windows.Forms.Timer;
using MenuItem = System.Windows.Controls.MenuItem;
using MessageBox = System.Windows.MessageBox;
using Orientation = System.Windows.Controls.Orientation;
using Panel = System.Windows.Controls.Panel;
using Path = System.IO.Path;
using ScrollBar = System.Windows.Controls.Primitives.ScrollBar;
using Timer = System.Windows.Forms.Timer;
namespace ChatController
{
@@ -90,11 +89,9 @@ namespace ChatController
}
}
private Chat _Chat;
public Chat Chat { get; set; }
private Contact _CurrentContact;
public ObservableCollection<ChatMessage> CurrentChatMessages => _CurrentContact != null && _Chat != null ? new ObservableCollection<ChatMessage>(_Chat.Messages) : new ObservableCollection<ChatMessage>();
public Contact CurrentContact
{
get => _CurrentContact;
@@ -107,7 +104,7 @@ namespace ChatController
OnPropertyChanged(nameof(CurrentContact));
OnPropertyChanged(nameof(ChatMessageInputGridVisibility));
OnPropertyChanged(nameof(CurrentChatMessages));
OnPropertyChanged(nameof(Chat));
OnPropertyChanged(nameof(CurrentContactInformationString));
OnPropertyChanged(nameof(CurrencContactInfoForeground));
OnPropertyChanged(nameof(ThreadExceptionImageSource));
@@ -156,6 +153,13 @@ namespace ChatController
_ThreadExceptionImageSource = new BitmapImage(new Uri("pack://application:,,,/ChatController;component/Ressourcen/warning-exclamation-mark.png", UriKind.Absolute));
_ChatMessages = new ObservableCollection<ChatMessage>();
ChatMessages = CollectionViewSource.GetDefaultView(_ChatMessages) as ListCollectionView;
if (ChatMessages != null)
{
ChatMessages.CustomSort = new ChatMessageComparer();
}
DataContext = this;
ReloadGruppen.Visibility = Visibility.Collapsed;
@@ -171,13 +175,16 @@ namespace ChatController
_IsInBackground = false;
}
private readonly ObservableCollection<ChatMessage> _ChatMessages;
public ListCollectionView ChatMessages { get; set; }
public void InitMitChatdaten(ChatDatenUebergabe cdu)
{
_Chat = new Chat(cdu, exception => {
Chat = new Chat(cdu, exception => {
this.Dispatch(
() => {
EndWaiting();
MessageBox.Show($"Fehler: {exception.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
});
},
@@ -193,7 +200,10 @@ namespace ChatController
});
});
_ContactList = _Chat.AddContacts();
OnPropertyChanged(nameof(Chat));
_ContactList = Chat.AddContacts();
OnPropertyChanged(nameof(ContactList));
ReadNewSyncFile();
@@ -202,11 +212,8 @@ namespace ChatController
{
if (_GroupId2DateTime.ContainsKey(contact.GroupId))
{
var dateTimeFromFile = _GroupId2DateTime[contact.GroupId].TimeStamp;
var isUnread = _GroupId2DateTime[contact.GroupId].IsUnread;
var isYounger = contact.TimeStamp > dateTimeFromFile;
contact.IsNewMessage = isUnread;
contact.HasUnreadMessages = contact.IsNewMessage;
}
@@ -301,19 +308,18 @@ namespace ChatController
{
if(e.ClickCount == 2)
{
_Chat.ShowProfilePicture(_CurrentContact);
Chat.ShowProfilePicture(_CurrentContact);
}
}
private void Clientlist_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
if(Clientlist?.SelectedItem != null && Clientlist?.SelectedItem is Contact selectedContact)
if(Clientlist?.SelectedItem is Contact selectedContact)
{
SelectContact(selectedContact);
}
}
// WebRequest: LoadChatMessagesForContact
private void SelectContact(Contact pContact)
{
if(pContact == null)
@@ -323,7 +329,8 @@ namespace ChatController
ShouldInterruptContactsThread = true;
Cursor = Cursors.Wait;
StartWaitingImmediately();
_ScrollPrueferAktivieren = false;
if (pContact.HasUnreadMessages)
@@ -339,7 +346,7 @@ namespace ChatController
var shouldChangeIcon = _ContactList.Any(contact => contact.IsNewMessage);
if(shouldChangeIcon)
{
ContainingWindow.Icon = Utils.GetImageSourceFromIcon(Resource.ownchat_favicon);
ContainingWindow.Icon = Utils.ConvertIconToImageSource(Resource.ownchat_favicon);
}
CurrentContact = currentContact;
@@ -349,27 +356,30 @@ namespace ChatController
Clientlist.SelectedItem = pContact;
}
var chatMessages = _Chat.LoadChatMessagesForContact(currentContact);
OnPropertyChanged(nameof(CurrentChatMessages));
_ChatMessages.Clear();
if (VisualTreeHelper.GetChildrenCount(ChatListBox) > 0)
Chat.LoadChatMessagesForContactAsync(currentContact, GetFirstMessage(), chatMessages =>
{
var border = (Border) VisualTreeHelper.GetChild(ChatListBox, 0);
var scrollViewer = (ScrollViewer) VisualTreeHelper.GetChild(border, 0);
scrollViewer.ScrollToBottom();
}
this.Dispatch(() =>
{
_ChatMessages.AddRangeIfElementsNotIn(chatMessages);
ChatListBox.ContextMenu = _Chat.ErstelleKontextMenue();
SetContextHandler();
_ScrollPrueferAktivieren = true;
WpfUtils.ScrollToBottomOfListBox(ChatListBox);
ListenForMessages();
Cursor = Cursors.Arrow;
ChatListBox.ContextMenu = Chat.ErstelleKontextMenue();
SetContextHandler();
_ScrollPrueferAktivieren = true;
WriteToNewSyncFile();
ListenForMessages();
Cursor = Cursors.Arrow;
ShouldInterruptContactsThread = false;
WriteToNewSyncFile();
ShouldInterruptContactsThread = false;
EndWaiting();
});
});
}
private void SetContextHandler()
@@ -423,13 +433,13 @@ namespace ChatController
{
var chatMessage = (ChatMessage) items;
_Chat.SaveFileAs(chatMessage);
Chat.SaveFileAs(chatMessage);
}
}
private void PasteOnClick(object sender, RoutedEventArgs routedEventArgs)
{
_Chat.Paste(CurrentContact.GroupId,this);
Chat.Paste(CurrentContact.GroupId,this);
}
private void CopyOnClick(object sender, RoutedEventArgs routedEventArgs)
@@ -445,7 +455,7 @@ namespace ChatController
if(!string.IsNullOrWhiteSpace(chatMessages))
{
_Chat.Copy(chatMessages, 1);
Chat.Copy(chatMessages, 1);
}
}
@@ -462,8 +472,8 @@ namespace ChatController
{
foreach(var items in chatMessages)
{
var item = items as ChatMessage;
if(item?.ImageSources != null)
var item = (ChatMessage) items;
if(item?.PictureSource != null)
{
if(ChatListBox.ContextMenu != null)
{
@@ -478,7 +488,7 @@ namespace ChatController
ContextItemSpeichernUnter.Visibility = Visibility.Collapsed;
}
if(item.ImageSources == null && item.FilePath == null)
if(item.PictureSource == null && item.FilePath == null)
{
var contextItems = ChatListBox.ContextMenu.Items;
var ContextItemSpeichernUnter = (MenuItem)contextItems[2];
@@ -553,30 +563,31 @@ namespace ChatController
{
if(CurrentContact != null)
{
var fileToOpen = _Chat.OpenFile();
var fileToOpen = Chat.OpenFile();
if(fileToOpen != null)
{
var filePath = FileUtils.ScaleImage(fileToOpen, Path.GetExtension(fileToOpen.ToUpperInvariant()), _Chat.ChatDaten.MaxUploadSize);
var filePath = FileUtils.ScaleImage(fileToOpen, Path.GetExtension(fileToOpen.ToUpperInvariant()), Chat.ChatDaten.MaxUploadSize);
var isFileSizeTooLarge = FileUtils.CheckFileSize(filePath, _Chat.ChatDaten.MaxUploadSize);
var isFileSizeTooLarge = FileUtils.CheckFileSize(filePath, Chat.ChatDaten.MaxUploadSize);
if(isFileSizeTooLarge)
{
MessageBox.Show($"Die ausgewählte Datei ist zu groß. Die maximale Größe beträgt {_Chat.ChatDaten.MaxUploadSize / 1000 / 1000} MB", "Senden nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
MessageBox.Show($"Die ausgewählte Datei ist zu groß. Die maximale Größe beträgt {Chat.ChatDaten.MaxUploadSize / 1000 / 1000} MB", "Senden nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
return;
}
if (!string.IsNullOrWhiteSpace(filePath))
{
_Chat.AddNewFile(filePath, fileToOpen, CurrentContact.GroupId);
_ChatMessages.AddRangeIfElementsNotIn(Chat.AddNewFile(filePath, fileToOpen, CurrentContact.GroupId, GetFirstMessage()));
OnPropertyChanged(nameof(CurrentChatMessages));
ChatListBox.Items.MoveCurrentToLast();
ChatListBox.ScrollIntoView(ChatListBox.Items.CurrentItem);
ChatMessages.MoveCurrentToLast();
_Chat.SendFileToContact(CurrentContact, filePath,fileToOpen);
var currentChatMessage = ChatMessages.CurrentItem;
ChatListBox.ScrollIntoView(currentChatMessage);
Chat.SendFileToContact(CurrentContact, filePath,fileToOpen);
if (!string.IsNullOrWhiteSpace(filePath) && !filePath.Equals(fileToOpen) && File.Exists(filePath))
{
@@ -595,14 +606,15 @@ namespace ChatController
{
if(CurrentContact != null && !string.IsNullOrEmpty(Chatbox.Text))
{
_Chat.AddNewMessage(Chatbox.Text, CurrentContact.GroupId);
_ChatMessages.AddRangeIfElementsNotIn(Chat.AddNewMessage(Chatbox.Text, CurrentContact.GroupId, GetFirstMessage()));
OnPropertyChanged(nameof(CurrentChatMessages));
ChatMessages.MoveCurrentToLast();
ChatListBox.Items.MoveCurrentToLast();
ChatListBox.ScrollIntoView(ChatListBox.Items.CurrentItem);
ChatListBox.ScrollIntoView(ChatMessages.CurrentItem);
_Chat.SendMessage(Chatbox.Text, CurrentContact.GroupId);
WpfUtils.ScrollToBottomOfListBox(ChatListBox);
Chat.SendMessage(Chatbox.Text, CurrentContact.GroupId);
Chatbox.Text = string.Empty;
}
@@ -621,22 +633,22 @@ namespace ChatController
{
try
{
if (e.Key == Key.Return)
{
if(CurrentContact != null && !string.IsNullOrEmpty(Chatbox.Text))
{
_Chat.AddNewMessage(Chatbox.Text, CurrentContact.GroupId);
//if (e.Key == Key.Return)
//{
// if(CurrentContact != null && !string.IsNullOrEmpty(Chatbox.Text))
// {
// Chat.AddNewMessage(Chatbox.Text, CurrentContact.GroupId);
OnPropertyChanged(nameof(CurrentChatMessages));
// OnPropertyChanged(nameof(CurrentChatMessages));
ChatListBox.Items.MoveCurrentToLast();
ChatListBox.ScrollIntoView(ChatListBox.Items.CurrentItem);
// ChatListBox.Items.MoveCurrentToLast();
// ChatListBox.ScrollIntoView(ChatListBox.Items.CurrentItem);
_Chat.SendMessage(Chatbox.Text, CurrentContact.GroupId);
// Chat.SendMessage(Chatbox.Text, CurrentContact.GroupId);
Chatbox.Text = string.Empty;
}
}
// Chatbox.Text = string.Empty;
// }
//}
}
catch (Exception ed)
{
@@ -669,7 +681,6 @@ namespace ChatController
}
}
// TODO: Asynchron machen?
private void VerticalScrollbarChanged(object sender, RoutedPropertyChangedEventArgs<double> routedPropertyChangedEventArgs)
{
if (_ScrollPrueferAktivieren)
@@ -678,25 +689,27 @@ namespace ChatController
if (!(scrollBar.Value > 0))
{
Cursor = Cursors.Wait;
StartWaitingImmediately();
_ScrollPrueferAktivieren = false;
ChatListBox.Items.MoveCurrentToFirst();
var currentChatMessage = ChatListBox.Items.CurrentItem as ChatMessage;
ChatMessages.MoveCurrentToFirst();
var kontakt = (Contact) Clientlist.SelectedItem;
_Chat.LoadMoreMessages(kontakt); // Ab hier käme das ins Callback
OnPropertyChanged(nameof(CurrentChatMessages));
if(currentChatMessage != null)
{
ChatListBox.ScrollIntoView(currentChatMessage);
}
var currentChatMessage = ChatMessages.CurrentItem;
Cursor = Cursors.Arrow;
var selectedContact = (Contact) Clientlist.SelectedItem;
Chat.LoadMoreMessagesAsync(selectedContact, GetFirstMessage(), chatMessages =>
{
this.Dispatch(() =>
{
EndWaiting();
_ChatMessages.AddRangeIfElementsNotIn(chatMessages);
ChatListBox.ScrollIntoView(currentChatMessage);
});
});
}
}
}
@@ -726,80 +739,73 @@ namespace ChatController
private void ListenGloballyForMessages()
{
var numberOfNewMessages = _Chat.GetNumberOfAllNewMessages();
if (numberOfNewMessages > 0)
Chat.GetNumberOfAllNewMessagesAsync(newMessagesCount =>
{
Dispatcher.BeginInvoke(
DispatcherPriority.Normal,
(Action)delegate
if(newMessagesCount > 0)
{
var contacts = _Chat.NeueGroupklassenKontakte().ToList();
foreach (var contact in _ContactList)
Chat.UpdateContactList(updatedContactList =>
{
foreach (var newContact in contacts)
var updatedContacts = updatedContactList.ToList();
this.Dispatch(() =>
{
if(newContact == null)
foreach (var contact in _ContactList)
{
continue;
}
if (contact.GroupId == newContact.GroupId)
{
// ReceivedMessage kann null sein!
if (contact.ReceivedMessage != null && !contact.ReceivedMessage.Id.Equals(newContact.ReceivedMessage?.Id))
foreach (var newContact in updatedContacts)
{
contact.ReceivedMessage = newContact.ReceivedMessage;
contact.TimeStamp = newContact.TimeStamp;
var selectedContact = (Contact) Clientlist.SelectedItem;
// Angemeldeter Benutzer
var userOid = _Chat.ChatDaten.LoggedInUser.Response.User.Oid;
var senderId = contact.ReceivedMessage?.UserId;
var receiverId = userOid;
var receiverGroupId = newContact.GroupId;
var selectedGroupId = selectedContact?.GroupId;
if(senderId != receiverId && (_IsInBackground || receiverGroupId != selectedGroupId))
if (contact.GroupId == newContact.GroupId)
{
if(ContainingWindow != null)
// ReceivedMessage kann null sein!
if (contact.ReceivedMessage != null && !contact.ReceivedMessage.Id.Equals(newContact.ReceivedMessage?.Id))
{
ContainingWindow.Icon = Utils.GetImageSourceFromIcon(Resource.oC_favico_NewMessage);
contact.ReceivedMessage = newContact.ReceivedMessage;
contact.TimeStamp = newContact.TimeStamp;
var selectedContact = (Contact)Clientlist.SelectedItem;
// Angemeldeter Benutzer
var userOid = Chat.ChatDaten.LoggedInUser.Response.User.Oid;
var senderId = contact.ReceivedMessage?.UserId;
var receiverId = userOid;
var receiverGroupId = newContact.GroupId;
var selectedGroupId = selectedContact?.GroupId;
if (senderId != receiverId && (_IsInBackground || receiverGroupId != selectedGroupId))
{
if (ContainingWindow != null)
{
ContainingWindow.Icon = Utils.ConvertIconToImageSource(Resource.oC_favico_NewMessage);
}
ShowNotification(newContact.Name, newContact.ReceivedMessage, newContact.GroupId);
}
// Wenn der momentan ausgewählte Kontakt der aktuelle Kontakt in der Schleife ist, werden die Nachrichten nicht als ungelesen angezeigt, sonst schon.
if (CurrentContact != null && newContact.GroupId == CurrentContact.GroupId)
{
contact.HasUnreadMessages = false;
}
else
{
contact.HasUnreadMessages = true;
contact.IsNewMessage = true;
}
}
}
}
ShowNotification(newContact.Name, newContact.ReceivedMessage, newContact.GroupId);
}
// Wenn der momentan ausgewählte Kontakt der aktuelle Kontakt in der Schleife ist, werden die Nachrichten nicht als ungelesen angezeigt, sonst schon.
if (CurrentContact != null && newContact.GroupId == CurrentContact.GroupId)
{
contact.HasUnreadMessages = false;
}
else
{
contact.HasUnreadMessages = true;
contact.IsNewMessage = true;
}
if (!updatedContacts.Contains(contact))
{
_ContactList.ToList().Remove(contact);
}
}
if (!_ContactList.Contains(newContact))
{
_ContactList.ToList().Add(newContact);
}
}
if (!contacts.Contains(contact))
{
_ContactList.ToList().Remove(contact);
}
}
Clientlist.Items.Refresh();
});
}
Clientlist.Items.Refresh();
});
});
}
});
}
private void InitListeningThread(Contact currentContact)
@@ -819,27 +825,29 @@ namespace ChatController
{
if (!ShouldInterruptContactsThread)
{
var hasNewMessages = _Chat.CheckIfNewMessagesExist(pCurrentContact);
if (hasNewMessages)
Chat.CheckIfNewMessagesExistAsync(CurrentContact.GroupId, hasNewMessages =>
{
Dispatcher.BeginInvoke(DispatcherPriority.Background,
(Action)delegate
if(!hasNewMessages)
{
return;
}
Chat.LoadChatMessagesForContactAsync(pCurrentContact, GetFirstMessage(), chatMessages =>
{
this.Dispatch(() =>
{
_Chat.LoadChatMessagesForContact(pCurrentContact);
_ChatMessages.Clear();
_ChatMessages.AddRangeIfElementsNotIn(chatMessages);
OnPropertyChanged(nameof(CurrentChatMessages));
ChatListBox.Items.MoveCurrentToLast();
ChatListBox.ScrollIntoView(ChatListBox.Items.CurrentItem);
WpfUtils.ScrollToBottomOfListBox(ChatListBox);
});
}
});
});
}
}
private void Suche_OnTextChanged(object sender, TextChangedEventArgs e)
{
OnPropertyChanged(nameof(CurrentChatMessages));
CollectionViewSource.GetDefaultView(Clientlist.ItemsSource).Refresh();
}
@@ -855,69 +863,70 @@ namespace ChatController
private void Chat_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
{
Cursor = Cursors.Wait;
var chatItems = ChatListBox.SelectedItems;
if (chatItems.Count > 0)
if(ChatListBox.SelectedItems.Count > 0)
{
foreach (var items in chatItems)
{
var item = items as ChatMessage;
var selectedItem = ChatListBox.SelectedItems[0];
if (item?.OriginalImage != null)
{
if(selectedItem is ChatMessage selectedMessage)
{
if(!string.IsNullOrEmpty(selectedMessage.OriginalImage))
{
StartWaitingImmediately();
_Chat.ShowPicture(item.OriginalImage, EndWaiting);
Chat.ShowPicture(selectedMessage.OriginalImage, CurrentContact.GroupId, (imageSource, windowTitle) =>
{
this.Dispatch(() =>
{
EndWaiting();
Chat.ShowPictureWindow(imageSource, windowTitle);
});
});
}
else if(item?.FilePath != null)
else if(selectedMessage.FilePath != null)
{
var filename = Path.GetFileName(item.FilePath.ToString());
LoadDocument(item.FilePath.ToString(), filename);
}
}
StartWaitingImmediately();
Cursor = Cursors.Arrow;
LoadDocumentAsync(selectedMessage.FilePath.ToString(), Path.GetFileName(selectedMessage.FilePath.ToString()), EndWaiting);
}
}
}
else
{
Cursor = Cursors.Arrow;
}
}
private void LoadDocument(string link, string filename)
private void LoadDocumentAsync(string uri, string fileName, Action callback)
{
try
{
StartWaiting();
var path = Path.Combine(Path.GetTempPath(), fileName);
var path = Path.Combine(Path.GetTempPath(), filename);
_CreatedTempFiles.Add(path);
if (!File.Exists(path))
{
using (var webClient = new WebClient())
{
webClient.DownloadFile(link, path);
}
if (File.Exists(path))
if(!File.Exists(path))
{
Chat.DownloadFileAsync(uri, path, () =>
{
Process.Start(path);
}
this.Dispatch(() =>
{
if (File.Exists(path))
{
Process.Start(path);
}
callback?.Invoke();
});
});
}
else
{
Process.Start(path);
callback?.Invoke();
}
}
catch (Exception e)
{
}
finally
catch(Exception exception)
{
EndWaiting();
MessageBox.Show(exception.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
@@ -973,11 +982,11 @@ namespace ChatController
WriteToNewSyncFile();
_Chat.ReloadGroupsAsync(data =>
Chat.ReloadGroupsAsync(data =>
{
this.Dispatch(() =>
{
_ContactList = _Chat.GroupklassenAktuallisieren(data); // <- dauert eine Sekunde!
_ContactList = Chat.UpdateContacts(data); // <- dauert eine Sekunde!
OnPropertyChanged(nameof(ContactList));
ReadNewSyncFile();
@@ -1066,7 +1075,7 @@ namespace ChatController
}
}
_Chat.LastTimeStamp = latestDateTime.GetUnixTimeStamp();
Chat.LastTimeStamp = latestDateTime.GetUnixTimeStamp();
}
}
catch (Exception e)
@@ -1184,5 +1193,15 @@ namespace ChatController
Chatbox.Height = 25;
}
}
public void AddMessages(List<ChatMessage> newMessages)
{
_ChatMessages.AddRangeIfElementsNotIn(newMessages);
}
public ChatMessage GetFirstMessage()
{
return _ChatMessages.FirstOrDefault();
}
}
}

193
ChatController/Core/OwnChatCache.cs
View File

@@ -1,17 +1,15 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Media;
namespace ChatController.Core
{
public class OwnChatCache
{
// Key-> "group-127" oder "user-938"
private Dictionary<string, ImageSourceCacheObject> _ImageSources = new Dictionary<string, ImageSourceCacheObject>();
private static readonly object _Lock = new object();
// Key-> "group-127" oder "user-938"
private Dictionary<string, BitmapCacheObject> _Bitmaps = new Dictionary<string, BitmapCacheObject>();
private Dictionary<string, ImageSourceCacheStorage> _ImageSourceCache = new Dictionary<string, ImageSourceCacheStorage>();
private static OwnChatCache _Instance;
@@ -25,109 +23,156 @@ namespace ChatController.Core
public void ClearAll()
{
ClearImageSources();
ClearBitmaps();
}
public void ClearImageSources()
{
_ImageSources.Clear();
}
public void ClearBitmaps()
{
_Bitmaps.Clear();
}
public ImageSource GetImageSourceFromCache(string key)
{
if(key == null || _ImageSources == null || !_ImageSources.ContainsKey(key))
lock(_Lock)
{
return null;
_ImageSourceCache.Clear();
}
}
public ImageSource GetImageSourceFromCache(string key, string name, CacheCategory cacheCategory)
{
lock(_Lock)
{
if(key == null || _ImageSourceCache == null || !_ImageSourceCache.ContainsKey(key))
{
return null;
}
var imageSourceCacheObject = _ImageSourceCache[key].GetCachedImageSource(cacheCategory, name);
return imageSourceCacheObject?.Image;
}
}
public void AddImageToCache(string key, ImageSource imageSource, CacheCategory cacheCategory, string name)
{
lock(_Lock)
{
if(_ImageSourceCache == null)
{
_ImageSourceCache = new Dictionary<string, ImageSourceCacheStorage>();
}
if(!_ImageSourceCache.ContainsKey(key))
{
_ImageSourceCache.Add(key, new ImageSourceCacheStorage());
}
_ImageSourceCache[key].AddImageSourceToCachedObjects(imageSource, cacheCategory, name);
}
}
public void AddProfilePictureToCache(string key, ImageSource imageSource)
{
lock(_Lock)
{
if(!_ImageSourceCache.ContainsKey(key))
{
_ImageSourceCache.Add(key, new ImageSourceCacheStorage());
}
_ImageSourceCache[key].SetCachedProfilePicture(imageSource);
}
}
public ImageSource GetCachedProfilePicture(string key)
{
lock(_Lock)
{
return _ImageSourceCache.ContainsKey(key) ?
_ImageSourceCache[key].GetCachedProfilePicture() :
null;
}
}
}
public class ImageSourceCacheStorage
{
private ImageSourceCacheObject _ProfilePicture;
public ImageSource GetCachedProfilePicture()
{
return _ProfilePicture?.ExpirationDate > DateTime.Now ? _ProfilePicture.Image : null;
}
public void SetCachedProfilePicture(ImageSource avatarImageSource)
{
if(avatarImageSource != null)
{
_ProfilePicture = new ImageSourceCacheObject(avatarImageSource, CacheCategory.ProfilePicture);
}
}
public Dictionary<CacheCategory, Dictionary<string, ImageSourceCacheObject>> CachedObjects { get; set; }
public ImageSourceCacheStorage()
{
CachedObjects = new Dictionary<CacheCategory, Dictionary<string, ImageSourceCacheObject>>();
}
public ImageSourceCacheObject GetCachedImageSource(CacheCategory cacheCategory, string name)
{
if(CachedObjects.ContainsKey(cacheCategory) && CachedObjects[cacheCategory].ContainsKey(name))
{
var imageSourceCacheObject = CachedObjects[cacheCategory][name];
return imageSourceCacheObject?.ExpirationDate > DateTime.Now ? imageSourceCacheObject : null;
}
var imageSourceCacheObject = _ImageSources[key];
var expirationDate = imageSourceCacheObject.ExpirationDate;
return expirationDate < DateTime.Now ? null : imageSourceCacheObject.Image;
return null;
}
public void AddImageToCache(string key, ImageSource imageSource)
public void AddImageSourceToCachedObjects(ImageSource imageSource, CacheCategory cacheCategory, string name)
{
if(_ImageSources == null)
if(CachedObjects == null)
{
_ImageSources = new Dictionary<string, ImageSourceCacheObject>();
CachedObjects = new Dictionary<CacheCategory, Dictionary<string, ImageSourceCacheObject>>();
}
var newImageSourceCacheObject = new ImageSourceCacheObject(imageSource);
var newImageSourceCacheObject = new ImageSourceCacheObject(imageSource, cacheCategory);
if(_ImageSources.ContainsKey(key))
if(CachedObjects.ContainsKey(cacheCategory) )
{
_ImageSources[key] = newImageSourceCacheObject;
if (CachedObjects[cacheCategory].ContainsKey(name))
{
CachedObjects[cacheCategory][name] = newImageSourceCacheObject;
}
else
{
CachedObjects[cacheCategory].Add(name, newImageSourceCacheObject);
}
}
else
{
_ImageSources.Add(key, newImageSourceCacheObject);
}
}
public Bitmap GetBitmapFromCache(string key)
{
if(key == null || _Bitmaps == null || !_Bitmaps.ContainsKey(key))
{
return null;
}
var bitmapCacheObject = _Bitmaps[key];
var expirationDate = bitmapCacheObject.ExpirationDate;
return expirationDate < DateTime.Now ? null : bitmapCacheObject.Bitmap;
}
public void AddBitmapToCache(string key, Bitmap bitmap)
{
if(_Bitmaps == null)
{
_Bitmaps = new Dictionary<string, BitmapCacheObject>();
}
var newBitmapCacheObject = new BitmapCacheObject(bitmap);
if(_Bitmaps.ContainsKey(key))
{
_Bitmaps[key] = newBitmapCacheObject;
}
else
{
_Bitmaps.Add(key, newBitmapCacheObject);
CachedObjects.Add(cacheCategory, new Dictionary<string, ImageSourceCacheObject> {{name, newImageSourceCacheObject } });
}
}
}
public class ImageSourceCacheObject
{
public CacheCategory CacheCategory { get; }
public DateTime ExpirationDate { get; }
public ImageSource Image { get; }
public ImageSourceCacheObject(ImageSource imageSource)
public ImageSourceCacheObject(ImageSource imageSource, CacheCategory cacheCategory)
{
ExpirationDate = DateTime.Now.AddYears(1);
Image = imageSource;
Image = imageSource;
CacheCategory = cacheCategory;
}
}
public class BitmapCacheObject
public enum CacheCategory
{
public DateTime ExpirationDate { get; }
public Bitmap Bitmap { get; }
public BitmapCacheObject(Bitmap bitmap)
{
ExpirationDate = DateTime.Now.AddYears(1);
Bitmap = bitmap;
}
ProfilePicture,
Thumbnail,
MessageAttachment
}
}

731
ChatController/HauptKlassen/Chat.cs
View File

File diff suppressed because it is too large Load Diff

47
ChatController/HauptKlassen/Login.cs
View File

@@ -12,6 +12,7 @@ using ChatController.Utilities;
using Newtonsoft.Json;
using RestSharp;
namespace ChatController.HauptKlassen
{
public class Login
@@ -65,9 +66,20 @@ namespace ChatController.HauptKlassen
_Tenant = tenant;
_ShouldShowMessageBox = false;
LookupServerUrlAsync(isSuccessful => { callback(ServerUrl); });
// TODO: Ändern, sonst wird keine Fehlermeldung angezeigt!
LookupServerUrlAsync(isSuccessful => { callback(ServerUrl); }, null);
}
// Wird im BeWoPlaner benutzt
public Login(string tenant, Action<string> callback, Action<string> exceptionCallback)
{
_Tenant = tenant;
_ShouldShowMessageBox = false;
LookupServerUrlAsync(isSuccessful => { callback(ServerUrl); }, exceptionCallback);
}
// Wird im BeWoPlaner benutzt
public ChatDatenUebergabe AnmeldevorgangDurchFuehren()
{
if(ServerErmittlung())
@@ -125,7 +137,7 @@ namespace ChatController.HauptKlassen
errorMessage => { exceptionCallback?.Invoke(errorMessage); });
}
});
}, errorMessage => { exceptionCallback?.Invoke(errorMessage); });
}
catch (Exception exception)
{
@@ -133,7 +145,7 @@ namespace ChatController.HauptKlassen
}
}
public void LookupServerUrlAsync(Action<bool> callback)
public void LookupServerUrlAsync(Action<bool> callback, Action<string> exceptionCallback)
{
try
{
@@ -163,19 +175,20 @@ namespace ChatController.HauptKlassen
result = true;
break;
case 1:
MessageBox.Show("Fehler: Kundennummer unbekannt.\nBitte überprüfen Sie die Anmeldeinformationen.", "ownChat Info", MessageBoxButton.OK, MessageBoxImage.Asterisk);
exceptionCallback?.Invoke("Fehler: Kundennummer unbekannt.\nBitte überprüfen Sie die Anmeldeinformationen.");
break;
case 2:
exceptionCallback?.Invoke("Der Diensttyp ist für die angegebene Kundennummer nicht definiert.");
MessageBox.Show("Der Diensttyp ist für die angegebene Kundennummer nicht definiert.", "ownChat Info", MessageBoxButton.OK, MessageBoxImage.Asterisk);
break;
}
callback?.Invoke(result);
});
}
catch (Exception exception)
{
MessageBox.Show("Fehler: Es konnte keine Verbindung aufgebaut werden.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
exceptionCallback?.Invoke("Fehler: Es konnte keine Verbindung aufgebaut werden.");
}
}
@@ -294,10 +307,10 @@ namespace ChatController.HauptKlassen
var endurl = _BaseUrl + Constants.LoginWithChatCodeUrl;
var requestBody = postparameter.Keys.Aggregate(string.Empty, (current, key) => current + HttpUtility.UrlEncode(key) + "=" + HttpUtility.UrlEncode(postparameter[key]) + "&");
var client = new RestClient(endurl);
var request = new RestRequest(Method.POST);
request.AddHeader("content-type", "application/x-www-form-urlencoded");
request.AddParameter(Constants.CustomerId, _Tenant, ParameterType.HttpHeader);
request.AddParameter("application/x-www-form-urlencoded", requestBody, ParameterType.RequestBody);
@@ -309,7 +322,7 @@ namespace ChatController.HauptKlassen
Debug.WriteLine(response.Content);
var userDaten = JsonConvert.DeserializeObject<UserDaten>(response.Content);
if(userDaten.Success)
if (userDaten.Success)
{
_AuthToken = userDaten.Response.User.Token;
_UserId = userDaten.Response.User.Oid;
@@ -323,16 +336,16 @@ namespace ChatController.HauptKlassen
}
else
{
if(userDaten.Error?.ChatCodeFailed != null)
if (userDaten.Error?.ChatCodeFailed != null)
{
if(_ShouldShowMessageBox)
if (_ShouldShowMessageBox)
{
MessageBox.Show("Fehler: " + userDaten.Error.ChatCodeFailed[0] + "\nBitte überprüfen Sie die Anmeldeinformationen.", "Info", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
else if(userDaten.Error?.LoginFailed != null)
else if (userDaten.Error?.LoginFailed != null)
{
if(_ShouldShowMessageBox)
if (_ShouldShowMessageBox)
{
MessageBox.Show("Fehler: " + userDaten.Error.LoginFailed[0] + "\nBitte überprüfen Sie die Anmeldeinformationen.", "Info", MessageBoxButton.OK, MessageBoxImage.Error);
}
@@ -396,7 +409,7 @@ namespace ChatController.HauptKlassen
{
var url = _BaseUrl + Constants.LoginWithChatCodeUrl;
var requestBody = $"{HttpUtility.UrlEncode("username")}={HttpUtility.UrlEncode(_UserName)}&{HttpUtility.UrlEncode("password")}={HttpUtility.UrlEncode(_Password)}&{HttpUtility.UrlEncode("chatcode")}={HttpUtility.UrlEncode(_ChatCode)}";
var client = new RestClient(url);
var request = new RestRequest(Method.POST);
@@ -463,8 +476,6 @@ namespace ChatController.HauptKlassen
});
}
#region Maximal erlaubte File Größe
public long GetMaiximumAllowedFileUploadSize(string pToken, string pCustomerId)
{
long maximumFileSize;
@@ -510,14 +521,12 @@ namespace ChatController.HauptKlassen
client.ExecuteAsync(request, response =>
{
var maxFileSizeAnonymous = JsonConvert.DeserializeAnonymousType(response.Content, new {file_upload_max_size = string.Empty});
var maxFileSizeAnonymous = JsonConvert.DeserializeAnonymousType(response.Content, new { file_upload_max_size = string.Empty });
var maxUploadFileSize = Convert.ToInt64(maxFileSizeAnonymous.file_upload_max_size);
callback?.Invoke(maxUploadFileSize);
});
}
#endregion
}
}

BIN
ChatController/Ressourcen/ownchat_image_placeholder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

3
ChatController/Utilities/Constants.cs
View File

@@ -11,6 +11,7 @@ namespace ChatController.Utilities
public static readonly string EmployeeDefaultImagePath = "pack://application:,,,/ChatController;component/Ressourcen/employee_default.png";
public static readonly string CustomerDefaultImagePath = "pack://application:,,,/ChatController;component/Ressourcen/client_default.png";
public static readonly string NormalGroupDefaultImagePath = "pack://application:,,,/ChatController;component/Ressourcen/mitarbeiter-team-avatar.png";
public static readonly string ImagePlaceholderPath = "pack://application:,,,/ChatController;component/Ressourcen/ownchat_image_placeholder.png";
public static readonly string Token = "Token";
public static readonly string CustomerId = "CustomerID";
@@ -31,5 +32,7 @@ namespace ChatController.Utilities
public static readonly string MultipartContentTypeValue = "multipart/form-data";
public static readonly string TenantAndChatCodeFileName = "ownChat.txt";
public static readonly string ProfilePictureCacheName = "profile-picture";
}
}

210
ChatController/Utilities/Utils.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
@@ -12,6 +11,7 @@ using System.Windows;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using ChatController.Core;
using RestSharp;
using MessageBox = System.Windows.MessageBox;
using PixelFormat = System.Drawing.Imaging.PixelFormat;
@@ -26,63 +26,20 @@ namespace ChatController.Utilities
public static DateTime DefaultDate = new DateTime(1, 1, 1);
public static ImageSource AvatarToImageSourceConverter(string pAvatarPath, bool pIsEmployee, bool pIsGroup)
public static void DownloadProfilePictureAsync(string pathToProfilePicture, string key, Action<ImageSource> callback)
{
return CreateImageSourceFromPath(pAvatarPath, pIsGroup, pIsEmployee);
}
var cache = OwnChatCache.GetInstance();
public static Bitmap ConvertAvatarToBitmap(string linkToPicture, bool isEmployee, bool isGroup)
{
Bitmap bitmap = null;
var cachedProfileImage = cache.GetCachedProfilePicture(key);
if(!string.IsNullOrWhiteSpace(linkToPicture))
if(cachedProfileImage != null)
{
Debug.WriteLine("Lade Bitmap herunter...");
var client = new RestClient(linkToPicture);
var request = new RestRequest(Method.GET)
{
ResponseWriter = responseStream =>
{
try
{
bitmap = new Bitmap(responseStream);
}
catch(Exception exception)
{
}
}
};
request.AddHeader(Constants.Token, AuthToken);
request.AddHeader(Constants.CustomerId, Tenant);
client.DownloadData(request);
callback?.Invoke(cachedProfileImage);
return;
}
if(bitmap != null)
{
return bitmap;
}
var defaultBitmap = (BitmapImage) GetDefaultImageSource(isGroup, isEmployee);
using(var outStream = new MemoryStream())
{
BitmapEncoder enc = new BmpBitmapEncoder();
enc.Frames.Add(BitmapFrame.Create(defaultBitmap));
enc.Save(outStream);
return new Bitmap(outStream);
}
}
public static void DownloadProfilePictureAsync(string avatarPath, bool isEmployee, bool isGroup, Action<ImageSource> callback)
{
var url = avatarPath;
var url = pathToProfilePicture;
var client = new RestClient(url);
var request = new RestRequest
{
@@ -97,16 +54,69 @@ namespace ChatController.Utilities
localStream.Position = 0;
bitmap.BeginInit();
bitmap.StreamSource = localStream;
bitmap.EndInit();
bitmap.Freeze();
cache.AddProfilePictureToCache(key, bitmap);
callback?.Invoke(bitmap);
}
};
request.AddHeader(Constants.Token, AuthToken);
request.AddHeader(Constants.CustomerId, Tenant);
client.ExecuteAsync(request, response => { /*Das übernimmt der ResponseWriter von oben*/ });
}
public static void DownloadImageAsync(string uri, string key, CacheCategory cacheCategory, Action<ImageSource> callback)
{
if(string.IsNullOrEmpty(uri))
{
callback?.Invoke(null);
return;
}
var cache = OwnChatCache.GetInstance();
var cachedImage = cache.GetImageSourceFromCache(key, uri, cacheCategory);
if (cachedImage != null)
{
callback?.Invoke(cachedImage);
return;
}
var url = uri;
var client = new RestClient(url);
var request = new RestRequest
{
ResponseWriter = stream =>
{
var bitmap = new BitmapImage();
var localStream = new MemoryStream();
stream.CopyTo(localStream);
localStream.Position = 0;
bitmap.BeginInit();
bitmap.StreamSource = localStream;
bitmap.EndInit();
bitmap.Freeze();
cache.AddImageToCache(key, bitmap, cacheCategory, uri);
callback?.Invoke(bitmap);
}
};
request.AddHeader(Constants.Token, AuthToken);
request.AddHeader(Constants.CustomerId, Tenant);
client.ExecuteAsync(request, response => { });
}
private static ImageSource GetDefaultImageSource(bool pIsGroup, bool pIsEmployee)
@@ -121,69 +131,29 @@ namespace ChatController.Utilities
{
defaultImage = Constants.CustomerDefaultImagePath;
}
var resultBitmapImage = new BitmapImage();
resultBitmapImage.BeginInit();
resultBitmapImage.UriSource = new Uri(defaultImage);
resultBitmapImage.EndInit();
resultBitmapImage.Freeze();
return resultBitmapImage;
}
public static ImageSource CreateImageSourceFromPath(string pPathToImageFile, bool pIsGroup = false, bool pIsEmployee = false)
public static ImageSource GetPicturePlaceholder()
{
if (!string.IsNullOrEmpty(pPathToImageFile))
{
Debug.WriteLine("Lade Bild herunter...");
var resultBitmapImage = new BitmapImage();
Bitmap bitmap = null;
resultBitmapImage.BeginInit();
resultBitmapImage.UriSource = new Uri(Constants.ImagePlaceholderPath);
resultBitmapImage.EndInit();
resultBitmapImage.Freeze();
var client = new RestClient(pPathToImageFile);
var request = new RestRequest(Method.GET)
{
ResponseWriter = stream =>
{
try
{
bitmap = new Bitmap(stream);
}
catch (ArgumentException)
{
bitmap = null;
}
}
};
request.AddHeader(Constants.Token, AuthToken);
request.AddHeader(Constants.CustomerId, Tenant);
client.DownloadData(request);
if (bitmap != null)
{
using (var memoryStream = new MemoryStream())
{
bitmap.Save(memoryStream, ImageFormat.Png);
memoryStream.Position = 0;
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
bitmapImage.StreamSource = memoryStream;
bitmapImage.EndInit();
return bitmapImage;
}
}
}
return GetDefaultImageSource(pIsGroup, pIsEmployee);
return resultBitmapImage;
}
public static string ReadStream(WebResponse response)
{
var dataStream = response.GetResponseStream();
@@ -262,7 +232,7 @@ namespace ChatController.Utilities
}
}
public static ImageSource GetImageSourceFromIcon(Icon pIcon)
public static ImageSource ConvertIconToImageSource(Icon pIcon)
{
var bitmap = new Bitmap(pIcon.Width, pIcon.Height);
@@ -443,20 +413,30 @@ namespace ChatController.Utilities
}
*/
public Bitmap ConvertStreamToBitmap(Stream imageStream)
public static int GetHeightFromThumbnailUri(string uri)
{
try
/*
https://test.ownchat.de/document.png
https://test.ownchat.de/profile/view-image/{customerid}/{width}/{height}/{filename}
https://test.ownchat.de/message/view-image/{customerid}/{group}/{height}/{filename}
*/
if (uri != null && uri.Contains("/"))
{
var image = Image.FromStream(imageStream);
var splitUri = uri.Split('/');
if(splitUri.Length>=2)
{
var heightStr = splitUri[splitUri.Length - 2];
return null;
}
catch(Exception exception)
{
throw exception;
if(int.TryParse(heightStr, out var height))
{
return height;
}
}
}
return 100;
}
}
}

32
ChatController/Utilities/WpfUtils.cs Normal file
View File

@@ -0,0 +1,32 @@
using System.Windows.Controls;
using System.Windows.Media;
namespace ChatController.Utilities
{
public class WpfUtils
{
public static void ScrollToBottomOfListBox(ListBox listBox)
{
if (VisualTreeHelper.GetChildrenCount(listBox) > 0)
{
var border = (Border)VisualTreeHelper.GetChild(listBox, 0);
var scrollViewer = (ScrollViewer)VisualTreeHelper.GetChild(border, 0);
scrollViewer?.ScrollToBottom();
}
}
public static ScrollViewer GetListBoxScrollViewer(ListBox listBox)
{
if (VisualTreeHelper.GetChildrenCount(listBox) > 0)
{
var border = (Border)VisualTreeHelper.GetChild(listBox, 0);
var scrollViewer = (ScrollViewer)VisualTreeHelper.GetChild(border, 0);
return scrollViewer;
}
return null;
}
}
}

1
ChatController/packages.config
View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClrHeapAllocationAnalyzer" version="3.0.0" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net45" />
</packages>

BIN
PrototypChat/.vs/PrototypChat/v16/.suo
View File

Binary file not shown.