feat: 历史界面美化 + 按应用分类
实现两个用户需求:消息内容完整显示、按 Gotify Application 分类。 新增: - Models/GotifyApplication.cs:对应 GET /application 返回字段(id/name/description/defaultPriority/createdAt/internal) - Services/ApplicationCache.cs:在内存里缓存 id→Application 映射,提供 GetName/Get 解析,Updated 事件触发 UI 刷新 - Services/GotifyApiService.GetApplicationsAsync:GET /application?limit=999 拉取应用列表 - Converters/ValueConverters.cs: - PriorityToBrushConverter:优先级 0/1-4/5-7/8+ 分别用浅灰/灰蓝/橙/红区分 - AppNameToBrushConverter:对应用名做 FNV-1a 32-bit hash → HSL 色相,让每个应用在历史里视觉上可区分 - GotifyMessage.AppName 字段(JsonIgnore),由 UI 在加入历史前从缓存查后填入 主窗重构(两栏布局): - 左侧历史列表:用 DataTemplate 自定义每行(优先级徽章 + 应用名彩色 + 标题 + 消息预览 TextWrapping+Trimming),不再用 GridView 单行 - 右侧详情面板:选中消息后显示完整内容(应用名大标题、描述、优先级+说明、时间、标题、App ID、消息正文、URL 链接) - 顶部状态条:状态点颜色(绿/橙/红/灰)+ 应用数显示(实时更新) - 新增按钮「刷新应用」,手动 GET /application,用于用户新建 Gotify app 后同步 - URL 链接(如果有)在详情面板显示,点击用默认浏览器打开 - SaveButton 在保存配置后自动重新拉应用列表+历史,不用重启 App.xaml.cs 改造:创建 ApplicationCache,启动时后台异步刷新一次,订阅 Updated 事件让 MainWindow 重新解析已加载消息的 AppName(因为消息先到,缓存可能后到) Color/Brush/MessageBox 在 WPF+WinForms 双开项目里撞名,ValueConverters 和 MainWindow.xaml.cs 都加 using alias 固定走 WPF。 实测:启动后 ApplicationCache refreshed count=5,WebSocket connected,历史拉了 50 条股票分析报告,通知正常弹。
This commit is contained in:
@@ -0,0 +1,59 @@
|
||||
using System.Collections.Concurrent;
|
||||
using WindowsGotify.Models;
|
||||
|
||||
namespace WindowsGotify.Services;
|
||||
|
||||
/// <summary>
|
||||
/// 缓存 Gotify Applications 列表(从 GET /application 拉取),供 UI 用来把消息的 AppId 解析为可读应用名。
|
||||
/// </summary>
|
||||
public sealed class ApplicationCache
|
||||
{
|
||||
private readonly ConcurrentDictionary<long, GotifyApplication> _apps = new();
|
||||
private readonly GotifyApiService _api;
|
||||
private readonly Logger _logger;
|
||||
private DateTimeOffset _lastFetchedAt = DateTimeOffset.MinValue;
|
||||
|
||||
public ApplicationCache(GotifyApiService api, Logger logger)
|
||||
{
|
||||
_api = api;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public int Count => _apps.Count;
|
||||
|
||||
public event EventHandler? Updated;
|
||||
|
||||
/// <summary>
|
||||
/// 拉一次最新的应用列表。失败抛异常,调用方决定怎么处理(忽略 / 重试 / 提示)。
|
||||
/// </summary>
|
||||
public async Task RefreshAsync(CancellationToken ct = default)
|
||||
{
|
||||
var list = await _api.GetApplicationsAsync(ct);
|
||||
_apps.Clear();
|
||||
foreach (var app in list)
|
||||
{
|
||||
_apps[app.Id] = app;
|
||||
}
|
||||
_lastFetchedAt = DateTimeOffset.UtcNow;
|
||||
_logger.Info($"ApplicationCache refreshed. count={list.Count}");
|
||||
Updated?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 把 appId 解析为应用名。缓存里没有就回退 "App {id}"。
|
||||
/// </summary>
|
||||
public string GetName(long appId)
|
||||
{
|
||||
return _apps.TryGetValue(appId, out var app) && !string.IsNullOrWhiteSpace(app.Name)
|
||||
? app.Name
|
||||
: $"App {appId}";
|
||||
}
|
||||
|
||||
public GotifyApplication? Get(long appId)
|
||||
{
|
||||
_apps.TryGetValue(appId, out var app);
|
||||
return app;
|
||||
}
|
||||
|
||||
public DateTimeOffset LastFetchedAt => _lastFetchedAt;
|
||||
}
|
||||
@@ -90,4 +90,19 @@ public sealed class GotifyApiService
|
||||
// Gotify 的 since=0 行为:返回数据库里所有消息中的 limit 条;按 id 降序再取一次保证正确
|
||||
return list.OrderByDescending(m => m.Id).Take(Math.Clamp(limit, 1, 100)).ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 拉取所有 Gotify Application,供 UI 用来把消息 AppId 解析为应用名。
|
||||
/// </summary>
|
||||
public async Task<List<GotifyApplication>> GetApplicationsAsync(CancellationToken ct)
|
||||
{
|
||||
SyncAuthHeaders();
|
||||
var path = "application?limit=999";
|
||||
using var response = await _httpClient.GetAsync(BuildUri(path), ct);
|
||||
response.EnsureSuccessStatusCode();
|
||||
|
||||
await using var stream = await response.Content.ReadAsStreamAsync(ct);
|
||||
var list = await JsonSerializer.DeserializeAsync<List<GotifyApplication>>(stream, cancellationToken: ct);
|
||||
return list ?? new List<GotifyApplication>();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user