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

Fixes

Browse Source
This commit is contained in:
Waldi
2017-10-20 07:34:26 +02:00
parent a077636f7c
commit c4041bd11a
5 changed files with 100 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
ChatController/ChatMainControl.xaml.cs
View File

@@ -149,7 +149,7 @@ namespace ChatController
{
doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer);
if (true || doSync)
if (doSync)
{
var aktuelleGruppen = _chat.GruppenAktuallisieren();
@@ -446,6 +446,7 @@ namespace ChatController
_chat.SendMessage(Chatbox.Text, kontakt.GroupId);
// neu performance versuch Adde
Chatbox.Text = "";
@@ -804,9 +805,9 @@ namespace ChatController
break;
}
Task.Delay(5000);
//Task.Delay(5000);
//Thread.Sleep(5000);
Thread.Sleep(5000);
}
}
@@ -833,21 +834,32 @@ namespace ChatController
private void Chat_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
{
Cursor = Cursors.Wait;
StartWaiting();
var chatItems = Chat.SelectedItems;
if (chatItems.Count > 0) {
if (chatItems.Count > 0)
{
foreach (var items in chatItems)
{
var item = items as KontaktMessageBuilder;
if (item != null && item.ImageSources != null)
{
_chat.ShowPicture(item);
EndWaiting();
Cursor = Cursors.Arrow;
}
}
}
else
{
EndWaiting();
Cursor = Cursors.Arrow;
}
}
#endregion
@@ -954,45 +966,17 @@ namespace ChatController
{
Cursor = Cursors.Wait;
//StartWaiting();
//if (_isDesktopVersion)
//{
// var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer);
var aktuelleGruppen = _chat.GruppenAktuallisieren();
// if (doSync)
// {
var aktuelleGruppen = _chat.GruppenAktuallisieren();
var x = _chat.GroupklassenAktuallisieren(aktuelleGruppen);
var x = _chat.GroupklassenAktuallisieren(aktuelleGruppen);
CollectionViewSource.GetDefaultView(Clientlist.ItemsSource).Refresh();
//Clientlist.Items.Refresh();
_kontaktlist = x;
LeseMessageInfoAusDatei();
Clientlist.Items.Refresh();
Cursor = Cursors.Arrow;
//}
//else
//{
// Cursor = Cursors.Arrow;
// // EndWaiting();
// if (OnClose != null)
// {
// OnClose();
// }
//}
//}
//else
//{
// var aktuelleGruppen = _chat.GruppenAktuallisieren();
// var x = _chat.GroupklassenAktuallisieren(aktuelleGruppen);
// _kontaktlist = x;
// Clientlist.Items.Refresh();
// Cursor = Cursors.Arrow;
//}
Cursor = Cursors.Arrow;
}
catch (Exception e)
{