From 04d06d4e3bbc2a6fc7a26fa775e38b2cf6449e9d Mon Sep 17 00:00:00 2001 From: LynJet <104435916+LynJet@users.noreply.github.com> Date: Mon, 30 May 2022 20:48:14 +0200 Subject: [PATCH] Eigene Nachrichten werden nicht als neu angezeigt. Beim Senden einer Nachricht wird die Kontaktliste aktualisiert. --- ChatController/ChatKlassen/Contact.cs | 10 ++++++++-- ChatController/ChatMainControl.xaml.cs | 4 +++- ChatController/Core/OwnChatCache.cs | 2 ++ ChatController/HauptKlassen/Chat.cs | 1 - ChatController/HauptKlassen/Login.cs | 3 +++ PrototypChat/.vs/PrototypChat/v16/.suo | Bin 278016 -> 265216 bytes 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChatController/ChatKlassen/Contact.cs b/ChatController/ChatKlassen/Contact.cs index 3a0346b..b4995a0 100644 --- a/ChatController/ChatKlassen/Contact.cs +++ b/ChatController/ChatKlassen/Contact.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Media; +using ChatController.Core; using ChatController.LoginKlassen; using ChatController.Utilities; using Brush = System.Windows.Media.Brush; @@ -46,8 +47,13 @@ namespace ChatController.ChatKlassen set { _HasUnreadMessages = value; - - if (_HasUnreadMessages) + + var userId = OwnChatCache.GetInstance().LoggedOnUserId; + var rmUserId = ReceivedMessage?.UserId; + + var isOwnMessage = rmUserId.HasValue && rmUserId.Value.Equals(userId); + + if (_HasUnreadMessages && !isOwnMessage) { _Color = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush; } diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs index a358aa4..4276c6a 100644 --- a/ChatController/ChatMainControl.xaml.cs +++ b/ChatController/ChatMainControl.xaml.cs @@ -641,6 +641,8 @@ namespace ChatController Chat.SendMessage(Chatbox.Text, CurrentContact.GroupId); Chatbox.Text = string.Empty; + + DoSynchro(); } } @@ -824,7 +826,7 @@ namespace ChatController } } - //Clientlist.Items.Refresh(); + Clientlist.Items.Refresh(); OnPropertyChanged(nameof(ChatMessages)); OnPropertyChanged(nameof(ContactList)); }); diff --git a/ChatController/Core/OwnChatCache.cs b/ChatController/Core/OwnChatCache.cs index 1428052..4bccde0 100644 --- a/ChatController/Core/OwnChatCache.cs +++ b/ChatController/Core/OwnChatCache.cs @@ -6,6 +6,8 @@ namespace ChatController.Core { public class OwnChatCache { + public long? LoggedOnUserId { get; set; } + private static readonly object _Lock = new object(); // Key-> "group-127" oder "user-938" diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs index d7c26be..d852898 100644 --- a/ChatController/HauptKlassen/Chat.cs +++ b/ChatController/HauptKlassen/Chat.cs @@ -3,7 +3,6 @@ using Newtonsoft.Json; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Drawing; using System.Drawing.Imaging; using System.IO; diff --git a/ChatController/HauptKlassen/Login.cs b/ChatController/HauptKlassen/Login.cs index 1d3d890..e19baa9 100644 --- a/ChatController/HauptKlassen/Login.cs +++ b/ChatController/HauptKlassen/Login.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Net; using System.Web; using System.Windows; +using ChatController.Core; using ChatController.Data; using ChatController.LoginKlassen; using ChatController.Utilities; @@ -431,6 +432,8 @@ namespace ChatController.HauptKlassen _LoggedInUser = connectionData; + OwnChatCache.GetInstance().LoggedOnUserId = _LoggedInUser.Response.User.Oid; + callback?.Invoke(true); } else diff --git a/PrototypChat/.vs/PrototypChat/v16/.suo b/PrototypChat/.vs/PrototypChat/v16/.suo index 98f684b25e142d1a9f3da217224431bd314640c4..bf8b3213baef83a24d9ad72bedd93f1f882e488d 100644 GIT binary patch delta 9364 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 eQ}C{GiI5n3=34oRUp