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

Benachrichtigungen verschwinden nicht mehr einfach

Browse Source
This commit is contained in:
Lyndon Jetten
2020-09-15 13:42:46 +02:00
parent a6627d1b97
commit fdc262d1ee
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
View File

@@ -10,7 +10,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'io.fabric.tools:gradle:1.25.4' classpath 'io.fabric.tools:gradle:1.28.0'
} }
} }
@@ -89,7 +89,7 @@ dependencies {
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
implementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') { implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
transitive = true transitive = true
} }

2
BeWoPlanerChat/bewoplaner-chat-android/build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'io.realm:realm-gradle-plugin:5.3.0' classpath 'io.realm:realm-gradle-plugin:5.3.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

4
BeWoPlanerChat/bewoplaner-chat-android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Tue May 14 14:34:33 CEST 2019 #Fri Aug 07 14:18:13 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

11
ChatController/ChatMainControl.xaml.cs
View File

@@ -24,6 +24,7 @@ using ChatController.HauptKlassen;
using ChatController.LoginKlassen; using ChatController.LoginKlassen;
using ChatController.Utilities; using ChatController.Utilities;
using ChatController.Utilities.Extensions; using ChatController.Utilities.Extensions;
using Application = System.Windows.Forms.Application;
using Button = System.Windows.Controls.Button; using Button = System.Windows.Controls.Button;
using Cursors = System.Windows.Input.Cursors; using Cursors = System.Windows.Input.Cursors;
using DataFormats = System.Windows.DataFormats; using DataFormats = System.Windows.DataFormats;
@@ -244,10 +245,11 @@ namespace ChatController
SelectContact(_ContactList.FirstOrDefault(f => f.GroupId.Equals(pGroupId))); SelectContact(_ContactList.FirstOrDefault(f => f.GroupId.Equals(pGroupId)));
}; };
notifyIcon.BalloonTipClosed += (sender, args) => notifyIcon.BalloonTipClosed += (sender, args) =>
{ {
DisposeAndRemoveNotification((NotifyIcon)sender, pGroupId); // TODO: wird beim ausblenden bzw. automatischem Schließen des "Balloons" ausgelöst
//DisposeAndRemoveNotification((NotifyIcon)sender, pGroupId);
}; };
_Group2NotifyIcons.AddOrUpdateValueInDictionary(pGroupId, notifyIcon); _Group2NotifyIcons.AddOrUpdateValueInDictionary(pGroupId, notifyIcon);
@@ -261,7 +263,9 @@ namespace ChatController
{ {
foreach(var notifyIcon in group2NotifyIcon.Value) foreach(var notifyIcon in group2NotifyIcon.Value)
{ {
notifyIcon.Icon = null;
notifyIcon.Dispose(); notifyIcon.Dispose();
Application.DoEvents();
} }
} }
@@ -272,6 +276,9 @@ namespace ChatController
{ {
pNotification.Dispose(); pNotification.Dispose();
_Group2NotifyIcons.Remove(pGroupId); _Group2NotifyIcons.Remove(pGroupId);
Application.DoEvents();
} }
public void ResetStyle() public void ResetStyle()

4
PrototypChat/MainWindow.xaml.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Threading;
using System.Windows; using System.Windows;
using ChatController.LoginKlassen; using ChatController.LoginKlassen;
@@ -43,6 +44,9 @@ namespace ownChat
ChatMainControl.DeleteTempFiles(); ChatMainControl.DeleteTempFiles();
ChatMainControl.WriteToNewSyncFile(); ChatMainControl.WriteToNewSyncFile();
ChatMainControl.ClearNotifications(); ChatMainControl.ClearNotifications();
Thread.Sleep(500);
Environment.Exit(0); Environment.Exit(0);
} }
} }