From 51abccbaaf30d13392a566fb069488efeba22e2d Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 17 Oct 2026 10:23:50 +0800 Subject: [PATCH] =?UTF-8?q?desktop=EF=BC=9A=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E3=80=81=E6=89=98=E7=9B=98=E5=9B=BE=E6=A0=87=E3=80=81?= =?UTF-8?q?=E9=98=B2=E5=A4=9A=E5=BC=80=EF=BC=88=E5=8D=95=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=20+=20=E5=8F=82=E6=95=B0=E8=BD=AC=E5=8F=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - LoginWindow:服务器地址 / 账号 / 密码 / 记住账号 → POST /api/web/auth/login 拿 user JWT; 本地已有令牌时先用 GET /api/web/me 验证,有效就跳过登录(窗口一闪而过),无效清掉令牌留下重登。 - TrayIconService(WinForms NotifyIcon,csproj 开 UseWindowsForms): 关窗口 = 隐藏到托盘(本机服务继续跑),双击托盘恢复,右键菜单「打开主界面 / 服务地址 / 版本 / 退出」; 第一次缩到托盘冒一次气泡提示。退出只走托盘「退出」(App 改 ShutdownMode=OnExplicitShutdown)。 - 防多开:SingleInstance(Local\ 命名互斥体 + 命名管道)。第二个实例不抢 17311 端口, 把 yuncang://open?code=… 转给已运行实例(在托盘里也会被弹出来并按 code 查询)后自己退出; 还在登录界面时先把 URL 存起来,登录完成后再查。 - 生命周期调整:本机 HTTP 服务与托盘在 App 里创建(登录前就可用),主窗口只管展示与操作; 日志改成全局 AppLog(窗口没开时的日志也会在窗口打开后补上)。 - 新增 AppSettings / SessionStore:%LOCALAPPDATA%\YuncangTrace\settings.json、session.json (服务器地址默认 http://127.0.0.1:7300;换服务器不会复用旧令牌)。 - 新增 ApiClient(登录 / 校验令牌)、MainWindow「退出登录」(清令牌回登录页)。 - 程序/托盘图标:Assets/app.ico + tools/make-icon.ps1(品牌蓝 + 白色播放三角)。 - csproj 关闭 ImplicitUsings:WPF 与 WinForms 同时开启时隐式命名空间会让 MessageBox / Application / Clipboard 等产生歧义。 ⚠️ 本机没有 .NET SDK,无法编译验证;已做 XAML/XML 良构与括号平衡检查。 --- desktop/App.xaml | 5 +- desktop/App.xaml.cs | 243 +++++++++++++++++++++-- desktop/Assets/app.ico | Bin 0 -> 1921 bytes desktop/LoginWindow.xaml | 42 ++++ desktop/LoginWindow.xaml.cs | 176 ++++++++++++++++ desktop/MainWindow.xaml | 11 +- desktop/MainWindow.xaml.cs | 127 +++++++----- desktop/README.md | 37 +++- desktop/Services/ApiClient.cs | 181 +++++++++++++++++ desktop/Services/AppLog.cs | 47 +++++ desktop/Services/AppSettings.cs | 84 ++++++++ desktop/Services/JsonUtil.cs | 1 - desktop/Services/LocalHttpServer.cs | 3 + desktop/Services/OrderQueryService.cs | 3 + desktop/Services/ProtocolHelper.cs | 2 + desktop/Services/SessionStore.cs | 86 ++++++++ desktop/Services/SingleInstance.cs | 3 + desktop/Services/TrayIconService.cs | 115 +++++++++++ desktop/YuncangTrace.LocalService.csproj | 12 +- desktop/tools/make-icon.ps1 | 56 ++++++ 20 files changed, 1150 insertions(+), 84 deletions(-) create mode 100644 desktop/Assets/app.ico create mode 100644 desktop/LoginWindow.xaml create mode 100644 desktop/LoginWindow.xaml.cs create mode 100644 desktop/Services/ApiClient.cs create mode 100644 desktop/Services/AppLog.cs create mode 100644 desktop/Services/AppSettings.cs create mode 100644 desktop/Services/SessionStore.cs create mode 100644 desktop/Services/TrayIconService.cs create mode 100644 desktop/tools/make-icon.ps1 diff --git a/desktop/App.xaml b/desktop/App.xaml index 6f476eb..319fb98 100644 --- a/desktop/App.xaml +++ b/desktop/App.xaml @@ -1,8 +1,9 @@ - + ShutdownMode="OnExplicitShutdown"> + + diff --git a/desktop/App.xaml.cs b/desktop/App.xaml.cs index e47265c..deea9b5 100644 --- a/desktop/App.xaml.cs +++ b/desktop/App.xaml.cs @@ -1,26 +1,41 @@ +using System; +using System.Net; using System.Windows; using YuncangTrace.LocalService.Services; namespace YuncangTrace.LocalService; /// -/// 应用入口 +/// 应用入口,负责四件事: /// -/// 两件事:**单实例**(协议被点开时系统会再启动一次本程序,要把参数转给已运行的实例) -/// 和**把窗口拉起来**。 +/// 1. **防多开**:全局互斥体;第二个实例把参数(可能是 `yuncang://open?code=xxx`)送给第一个实例后自己退出; +/// 2. **本机 HTTP 服务**(127.0.0.1:17311):登录前就起来,关窗口也不停(托盘里继续跑); +/// 3. **托盘图标**:关窗口 = 缩到托盘;只有从托盘菜单「退出」才真正退出; +/// 4. **登录**:有本地令牌先验证(`/api/web/me`),失效就弹登录窗;登录成功再开主窗口。 /// public partial class App : Application { + private const string AppName = "YuncangTrace.LocalService"; + private SingleInstance? _single; - private MainWindow? _window; + private AppSettings _settings = new(); + private LocalHttpServer? _server; + private TrayIconService? _tray; + private MainWindow? _main; + private Session? _session; + private string? _pendingLaunchUrl; + private bool _exiting; + private bool _trayHintShown; protected override void OnStartup(StartupEventArgs e) { base.OnStartup(e); - _single = new SingleInstance("YuncangTrace.LocalService", OnSecondInstanceArgs); + // WinForms 控件的视觉样式(否则托盘右键菜单是 Win95 风格) + System.Windows.Forms.Application.EnableVisualStyles(); - // 已经有一个实例在跑:把自己的参数(可能是 yuncang://open?code=xxx)转过去,然后退出 + // ① 防多开 + _single = new SingleInstance(AppName, OnSecondInstanceArgs); if (!_single.IsFirstInstance) { _single.SendArgs(e.Args); @@ -28,36 +43,226 @@ public partial class App : Application return; } - _window = new MainWindow(); - MainWindow = _window; - _window.Show(); + _settings = AppSettings.Load(); + _pendingLaunchUrl = ProtocolHelper.FirstLaunchUrl(e.Args); - // 起命名管道监听(接收后续「再次启动」带来的参数) + // ② 本机服务先起来(和登录状态无关) + _server = new LocalHttpServer(new OrderQueryService()); + _server.Log += AppLog.Write; + StartLocalServer(); + + // ③ 托盘 + var version = GetType().Assembly.GetName().Version?.ToString() ?? "1.0.0"; + _tray = new TrayIconService(_server.BaseUrl, version); + _tray.ShowRequested += ShowAppWindow; + _tray.ExitRequested += ExitApplication; + UpdateTrayStatus(); + + AppLog.Write($"本机服务:{_server.BaseUrl}({(_server.IsRunning ? "运行中" : "未启动")})"); + + // ④ 登录 → 主窗口 + if (!ShowLogin()) + { + ExitApplication(); + return; + } + + ShowMainWindow(); _single.StartListening(); - - // 本次就是被协议拉起来的:直接进入「按 code 查信息」 - var launchUrl = ProtocolHelper.FirstLaunchUrl(e.Args); - if (launchUrl is not null) _window.HandleLaunchUrl(launchUrl); } + // ---------------- 登录 ---------------- + + /// 显示登录窗;返回 false = 用户取消(应退出程序) + private bool ShowLogin() + { + var saved = SessionStore.Load(); + + // 换了服务器地址就别复用旧令牌了 + if (saved is not null + && !string.Equals(saved.ServerBaseUrl, _settings.ServerBaseUrl, StringComparison.OrdinalIgnoreCase)) + { + AppLog.Write("服务器地址已变更,需要重新登录"); + saved = null; + } + + var login = new LoginWindow(_settings, saved); + if (login.ShowDialog() == true && login.Session is not null) + { + _session = login.Session; + return true; + } + + return false; + } + + /// 退出登录:清令牌 → 关主窗口 → 重新登录(取消则退出程序) + private void OnLogoutRequested() + { + AppLog.Write("已退出登录"); + SessionStore.Clear(); + _session = null; + + if (_main is not null) + { + _main.AllowClose = true; + _main.Close(); + _main = null; + } + + if (!ShowLogin()) + { + ExitApplication(); + return; + } + + ShowMainWindow(); + } + + // ---------------- 窗口 ---------------- + + private void ShowMainWindow() + { + var server = _server; + var session = _session; + if (server is null || session is null) return; + + if (_main is null) + { + _main = new MainWindow(server, _settings, session); + _main.LogoutRequested += OnLogoutRequested; + _main.HiddenToTray += OnHiddenToTray; + _main.ServiceStateChanged += UpdateTrayStatus; + } + + ShowAppWindow(); + + // 被协议带过来的 code:登录完再查 + if (_pendingLaunchUrl is not null) + { + var url = _pendingLaunchUrl; + _pendingLaunchUrl = null; + _main.HandleLaunchUrl(url); + } + } + + /// 把窗口显示出来(托盘双击 / 第二个实例启动时也走这里) + private void ShowAppWindow() + { + if (_main is null) return; + + if (!_main.IsVisible) _main.Show(); + if (_main.WindowState == WindowState.Minimized) _main.WindowState = WindowState.Normal; + + _main.Activate(); + _main.Topmost = true; + _main.Topmost = false; + _main.Focus(); + } + + private void OnHiddenToTray() + { + if (_trayHintShown) return; + + _trayHintShown = true; + _tray?.ShowBalloon("云仓视频溯源软件仍在运行", + $"本机服务在 {_server?.BaseUrl} 继续提供,双击托盘图标可重新打开窗口。"); + } + + // ---------------- 本机服务 ---------------- + + private void StartLocalServer() + { + if (_server is null) return; + + try + { + _server.Start(); + } + catch (HttpListenerException ex) + { + var hint = ex.ErrorCode switch + { + 5 => "没有绑定端口的权限。用管理员执行一次:netsh http add urlacl url=http://localhost:17311/ user=%USERNAME%", + 32 => "端口 17311 已被占用(可能还有一个本程序实例在跑)。", + _ => $"启动本机服务失败:{ex.Message}", + }; + AppLog.Write(hint); + MessageBox.Show(hint, "本机服务启动失败", MessageBoxButton.OK, MessageBoxImage.Warning); + } + catch (Exception ex) + { + AppLog.Write($"启动本机服务失败:{ex.Message}"); + MessageBox.Show(ex.Message, "本机服务启动失败", MessageBoxButton.OK, MessageBoxImage.Warning); + } + + UpdateTrayStatus(); + } + + private void UpdateTrayStatus() + { + _tray?.UpdateStatus(_server?.IsRunning == true ? $"运行中 · {_server.BaseUrl}" : "本机服务未启动"); + } + + // ---------------- 单实例 / 退出 ---------------- + /// 另一个实例把参数送过来了(工作线程回调,切回 UI 线程) private void OnSecondInstanceArgs(string[] args) { Dispatcher.Invoke(() => { - if (MainWindow is MainWindow window) + var url = ProtocolHelper.FirstLaunchUrl(args); + if (url is not null) { - if (window.WindowState == WindowState.Minimized) window.WindowState = WindowState.Normal; - window.Activate(); + AppLog.Write($"另一个实例请求打开:{url}"); - var url = ProtocolHelper.FirstLaunchUrl(args); - if (url is not null) window.HandleLaunchUrl(url); + if (_main is null) + { + // 还在登录界面:等登录完再查 + _pendingLaunchUrl = url; + return; + } + + ShowAppWindow(); + _main.HandleLaunchUrl(url); + return; } + + ShowAppWindow(); }); } + /// 真正退出(托盘菜单 / 登录取消 / 退出登录后取消登录) + private void ExitApplication() + { + if (_exiting) return; + _exiting = true; + + try + { + _tray?.Dispose(); + } + catch + { + // 退出路径忽略 + } + + try + { + _server?.Dispose(); + } + catch + { + // 退出路径忽略 + } + + Shutdown(); + } + protected override void OnExit(ExitEventArgs e) { + _tray?.Dispose(); + _server?.Dispose(); _single?.Dispose(); base.OnExit(e); } diff --git a/desktop/Assets/app.ico b/desktop/Assets/app.ico new file mode 100644 index 0000000000000000000000000000000000000000..4796935921d9ff4a567aeec3c759c3c670d0a342 GIT binary patch literal 1921 zcmdT_`%_a_5Z)UeNnnUP9H0^uB%)M6G_{He;StcJATU(v2r5u0jPleVfl=wLMXgFD zW~`v8#L;T42=Y*HiXegnQAtFrLIJ}dl3{q0sX%#kFaFl?4`^>Db9c{vyWh8W?>z^A zz#m=&0S=Hz2e3xxL}>69Gm|AIXqt&d{$UuVAiyxj+s^&h<0(%Pw#5%h)a-tA3=@2} z`T~^Yna;!*q0dYc?T`Sl8mK?flzKf5fDU4R-))(@hq`J`U42KWV&-ki0u%E0@~YGO z2P?%+q6==c@~ulOa<++MO&)w<>gy_B&af6=32~B}b5tLD_~*lgzZS0Je)Ou?KGLs{rtl?tb#io;N++4-@&=Y>Uok5c zRaJRcR0KnGt0A0Z!eT2}OYCOTWP`1cJ3FM_pitb(F4rGOGbTip_T-+_ zn)#P~P2Tgb)vp_@2~kEks033z)h)%Z1szidyDc#B9t255k30<>+69DdwRFCk9yK77 zxgm=df~F@&v`K~EP7SNQk4GT*83frK&(YL&OHtVESObqfnK{9bo`;}=BbxaGqP9Sg zw^)#6`$UtE6-pjw&|4vwMWJSg?30rJ;P0jH586(VfS%5cMka1L^EN!i!!;Zb6 z;>T7pXfjt!Ni1B;QYBf_WH&#MxX@%lFt9crhQYCA&@Ia5o=u|AK2vjv(0ugz42 zF|1%f6?MNqZgwovi3Vi|MJdx5ujR5r4l%6YHd*sE_kB4zljBkpFp8++zc z1uArVOKYg5%yIVk(1*?>UXu%*&3G)zVdJ~OBv;nEi$T7gUgxNF#Yd9}d@F$+A$ny^ z?t3I1xTDFK^Gf>+{l#R}8|fpd5n_a(a@6YAXuGEFa7}RleUK}x9UEAE@0Yh{aa<7w zqfL3kyk4Fe#wsBfBQDxgs;)ALLh!qdOlC z$WkqkB!VIdyv6H{G)Kr{QaYEeanz3Elyl(j327@5JvZoeI*-2AvP>urW7BU`<_S`jii_NL^(QWtgB5E(H0-O_0*F%N{?2$FQ+Cas?VEF+K4m zR@_dnlSCG+gyxb@p|InIBYt))QdqkQUu`vFisZmiI8hO2Xm+;)P4Y{eQj;+z@j1}U zGDC{C13vya>5oZu;M-@ zlFfMJ2?g%H|Es+=^xsFru4E{z&C;nF7+}g3C_9upK6(O0cGc2dL)+7{gu8#j0}{jm L!Tu$F(MSFPUVX#l literal 0 HcmV?d00001 diff --git a/desktop/LoginWindow.xaml b/desktop/LoginWindow.xaml new file mode 100644 index 0000000..3b7410e --- /dev/null +++ b/desktop/LoginWindow.xaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + +