diff --git a/desktop/App.xaml.cs b/desktop/App.xaml.cs index 00b3317..6ff9475 100644 --- a/desktop/App.xaml.cs +++ b/desktop/App.xaml.cs @@ -281,6 +281,8 @@ public partial class App : Application _main = new MainWindow(server, _settings, session); _main.LogoutRequested += OnLogoutRequested; _main.HiddenToTray += OnHiddenToTray; + _main.RestartRequested += RestartApplication; + _main.CheckUpdateRequested += () => _ = CheckUpdatesAsync(); } ShowAppWindow(); diff --git a/desktop/MainWindow.xaml b/desktop/MainWindow.xaml index 15e1101..83e9303 100644 --- a/desktop/MainWindow.xaml +++ b/desktop/MainWindow.xaml @@ -10,13 +10,35 @@ FontSize="13"> + + + + + + + + + + + + + + + + + + + + + + - + @@ -32,7 +54,7 @@ - @@ -50,7 +72,7 @@ - + diff --git a/desktop/MainWindow.xaml.cs b/desktop/MainWindow.xaml.cs index 849a373..6e0d491 100644 --- a/desktop/MainWindow.xaml.cs +++ b/desktop/MainWindow.xaml.cs @@ -1,6 +1,7 @@ using System; using System.Collections.ObjectModel; using System.ComponentModel; +using System.IO; using System.Windows; using System.Windows.Input; using System.Windows.Media; @@ -29,6 +30,12 @@ public partial class MainWindow : Window /// 窗口被隐藏到托盘(用来弹一次气泡提示) public event Action? HiddenToTray; + /// 菜单「帮助 → 检查更新」(交给 App 处理,复用启动时的检查逻辑) + public event Action? CheckUpdateRequested; + + /// 菜单「服务 → 重启软件」(交给 App 处理:先退出再延迟拉起) + public event Action? RestartRequested; + public MainWindow(LocalHttpServer server, AppSettings settings, Session session) { InitializeComponent(); @@ -82,6 +89,47 @@ public partial class MainWindow : Window StatusText.Text = running ? $"运行中 · {_server.BaseUrl}" : "未启动"; StatusDot.Fill = (Brush)FindResource(running ? "OkBrush" : "BadBrush"); + MenuServiceStatus.Header = running ? "服务状态:运行中" : "服务状态:未启动"; + } + + // ---------------- 菜单 ---------------- + + private void FocusQuery_Click(object sender, RoutedEventArgs e) + { + QueryBox.Focus(); + QueryBox.SelectAll(); + } + + private void ClearUpdateCache_Click(object sender, RoutedEventArgs e) + { + var dir = Path.Combine(Path.GetTempPath(), "YuncangTraceUpdate"); + try + { + if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true); + AppLog.Write($"已清理更新缓存:{dir}"); + } + catch (Exception ex) + { + AppLog.Write($"清理更新缓存失败:{ex.Message}"); + } + } + + private void Restart_Click(object sender, RoutedEventArgs e) => RestartRequested?.Invoke(); + + private void CheckUpdate_Click(object sender, RoutedEventArgs e) => CheckUpdateRequested?.Invoke(); + + private void About_Click(object sender, RoutedEventArgs e) + { + var version = GetType().Assembly.GetName().Version?.ToString() ?? "1.0.0"; + + MessageBox.Show(this, + $"云仓视频溯源软件(本机服务)\n\n" + + $"版本:{version}\n" + + $"环境:{BuildInfo.EnvironmentLabel}\n" + + $"服务:{(_server.IsRunning ? "运行中" : "未启动")}", + "关于", + MessageBoxButton.OK, + MessageBoxImage.Information); } // ---------------- 查询 ---------------- diff --git a/desktop/README.md b/desktop/README.md index 8684b7b..7d7a691 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -51,6 +51,11 @@ desktop/ > 主界面**没有「停止服务 / 启动服务」**:本机服务跟随程序生命周期(启动即开、退出即停)。 > 留个停止按钮只会让用户误点后网页再也叫不醒软件(显示内容与「未安装」一模一样)。 > 也**没有「复制唤醒地址」**:唤醒地址由插件生成,不需要在界面上手测。 +> +> 主界面顶部菜单: +> - **工具**:测试查询(聚焦输入框)、清理更新缓存(`%TEMP%\YuncangTraceUpdate`) +> - **服务**:服务状态(只读)、重启软件 +> - **帮助**:检查更新、关于(版本 / 环境 / 运行状态) ## 环境配置(开发 / 生产)