KennethCheng
e53c0585f7
dotnet 8.0.424 SDK + Microsoft.WindowsAppSDK 2.4.0 实测 build 通过(0 警告 0 错误)。
修复内容:
- csproj:TargetFramework 从 net8.0-windows 改为 net8.0-windows10.0.19041.0,新增 SupportedOSPlatformVersion=10.0.17763.0(WindowsAppSDK 2.4.0 强制要求 TFM 带 Windows 版本号)
- 4 个 Services 文件加 using System.IO(Logger/ConfigService/StateService/GotifyWebSocketService)。WPF+WinForms 双开项目模板不自动 import System.IO
- GotifyApiService 加 using System.Net.Http(同上,HttpClient 不在 implicit usings)
- App.xaml.cs:using Application = System.Windows.Application(WPF/WinForms Application 撞名)
- MainWindow.xaml.cs:using MessageBox = System.Windows.MessageBox(同上,MessageBox 撞名)
- App.xaml.cs:SendTestNotificationAsync 里 Date 从 .UtcNow.ToUnixTimeMilliseconds() 改回 .UtcNow(原 plan 写法有 bug,long 塞不进 DateTimeOffset)
- App.xaml.cs:OnNotificationInvoked 重写:WindowsAppSDK 2.4.0 把 args.Arguments 从 string 改成 IDictionary<string,string>,改用 TryGetValue("url", out var url) 取参数
- NotificationService:AddArgument 从单参 "url=escaped" 改成两参 ("url", url)。WindowsAppSDK 2.4.0 不再支持单参 "key=value" 写法
- GotifyWebSocketService:删除 _forceReconnect 字段(写了不读,改成 RequestReconnect 只调 socket.Abort 让外层 RunLoopAsync 自然重连)
68 lines
2.1 KiB
C#
68 lines
2.1 KiB
C#
using Microsoft.Windows.AppNotifications;
|
|
using Microsoft.Windows.AppNotifications.Builder;
|
|
using WindowsGotify.Models;
|
|
|
|
namespace WindowsGotify.Services;
|
|
|
|
public sealed class NotificationService
|
|
{
|
|
private readonly NotificationConfig _config;
|
|
private readonly Logger _logger;
|
|
|
|
public NotificationService(AppConfig config, Logger logger)
|
|
{
|
|
_config = config.Notification;
|
|
_logger = logger;
|
|
}
|
|
|
|
public Task ShowAsync(GotifyMessage message)
|
|
{
|
|
if (!_config.Enabled)
|
|
return Task.CompletedTask;
|
|
|
|
try
|
|
{
|
|
var title = string.IsNullOrWhiteSpace(message.Title)
|
|
? "Gotify"
|
|
: message.Title.Trim();
|
|
|
|
var body = message.Message ?? string.Empty;
|
|
if (body.Length > _config.MaxMessageLength)
|
|
{
|
|
body = body[..Math.Max(0, _config.MaxMessageLength)] + "…";
|
|
}
|
|
|
|
var builder = new AppNotificationBuilder()
|
|
.AddText(title)
|
|
.AddText(body);
|
|
|
|
if (_config.Sound)
|
|
{
|
|
builder.SetAudioEvent(
|
|
message.Priority >= 8
|
|
? AppNotificationSoundEvent.Alarm
|
|
: AppNotificationSoundEvent.Default);
|
|
}
|
|
|
|
// 把 extras 里的 client::notification.click.url 透传给通知,让 App.OnNotificationInvoked 收到
|
|
// Windows App SDK 2.4.0 的 AddArgument 是 (key, value) 两参,跟 1.x 的单参 "key=value" 不一样
|
|
var clickUrl = message.ClickUrl;
|
|
if (!string.IsNullOrWhiteSpace(clickUrl))
|
|
{
|
|
builder.AddArgument("url", clickUrl);
|
|
}
|
|
|
|
var notification = builder.BuildNotification();
|
|
AppNotificationManager.Default.Show(notification);
|
|
|
|
_logger.Info($"Notification shown. id={message.Id}, priority={message.Priority}, title={title}");
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.Error($"Notification display failed. id={message.Id}", ex);
|
|
}
|
|
|
|
return Task.CompletedTask;
|
|
}
|
|
}
|