diff --git a/src/MaaWpfGui/Helper/ToastNotification.cs b/src/MaaWpfGui/Helper/ToastNotification.cs index 09855a8136..3d3f82febb 100644 --- a/src/MaaWpfGui/Helper/ToastNotification.cs +++ b/src/MaaWpfGui/Helper/ToastNotification.cs @@ -23,7 +23,9 @@ using System.Windows; using System.Windows.Interop; using System.Windows.Media; using System.Windows.Media.Imaging; +using HandyControl.Data; using MaaWpfGui.Configuration; +using MaaWpfGui.Constants; using Microsoft.Toolkit.Uwp.Notifications; using Microsoft.Win32; using Notification.Wpf; @@ -60,6 +62,8 @@ namespace MaaWpfGui.Helper private static readonly ILogger _logger = Log.ForContext(); + public static Action ShowBalloonTip { get; set; } + /// /// Checks toast system. /// @@ -390,6 +394,15 @@ namespace MaaWpfGui.Helper #region 显示通知方法 + /// + /// 显示通知 + /// + public void Show() + { + _contentCollection.AppendLine(); // content 不能为空,否则通知发不出去 + ShowBalloonTip(_notificationTitle, _contentCollection.ToString(), NotifyIconInfoType.None); + } + /// /// 显示通知 /// @@ -402,6 +415,10 @@ namespace MaaWpfGui.Helper NotificationSounds sound = NotificationSounds.Notification, NotificationContent notificationContent = null) { + Show(); + return; + + // TODO: 整理过时代码 if (!ConfigFactory.CurrentConfig.GUI.UseNotify) { return; diff --git a/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs b/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs index 34e97a687c..879a7f8b1d 100644 --- a/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs +++ b/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs @@ -30,6 +30,7 @@ namespace MaaWpfGui.Views.UI { InitializeComponent(); InitIcon(); + ToastNotification.ShowBalloonTip = notifyIcon.ShowBalloonTip; } private void InitIcon()