diff --git a/desktop/App.xaml.cs b/desktop/App.xaml.cs index af9e888..ffdd7d2 100644 --- a/desktop/App.xaml.cs +++ b/desktop/App.xaml.cs @@ -1,9 +1,13 @@ using System; +using System.Collections.Generic; using System.Diagnostics; +using System.Linq; using System.Net; using System.Threading.Tasks; using System.Windows; using YuncangTrace.LocalService.Services; +using YuncangTrace.LocalService.Services.Hik; +using YuncangTrace.LocalService.Services.Scan; namespace YuncangTrace.LocalService; @@ -22,18 +26,38 @@ public partial class App : Application private SingleInstance? _single; private AppSettings _settings = new(); private LocalHttpServer? _server; + private HikDeviceService? _hik; private TrayIconService? _tray; private MainWindow? _main; private LoginWindow? _loginWindow; private Session? _session; + private ApiClient? _api; + private DeviceService? _device; + private ScanService? _scan; + private IReadOnlyList _subjects = Array.Empty(); private string? _pendingLaunchUrl; private bool _exiting; private bool _trayHintShown; + /// NTP 定时校时(运行期间周期性把本机时钟校准到 NTP) + private System.Threading.Timer? _ntpTimer; + + /// 防止启动校时与定时校时重叠 + private readonly System.Threading.SemaphoreSlim _ntpGate = new(1, 1); + protected override void OnStartup(StartupEventArgs e) { base.OnStartup(e); + // ⓪ 提权校时 helper:NTP 窗口用 runas 拉起的临时进程,只干一次校时后立刻退出。 + // 必须放在**防多开之前** —— 否则第二个实例会把参数转发给主实例然后自己退出,校时不会发生。 + if (ElevatedNtp.IsHelperCall(e.Args)) + { + ElevatedNtp.RunHelper(e.Args); + Shutdown(); + return; + } + // WinForms 控件的视觉样式(否则托盘右键菜单是 Win95 风格) System.Windows.Forms.Application.EnableVisualStyles(); @@ -41,29 +65,69 @@ public partial class App : Application _single = new SingleInstance(AppName, OnSecondInstanceArgs); if (!_single.IsFirstInstance) { - _single.SendArgs(e.Args); + var forwarded = _single.SendArgs(e.Args); + + // 协议唤起(yuncang://open?code=)转发失败时必须告诉用户, + // 否则表现就是“点了没反应”(第一实例是管理员权限时必然发生)。 + if (!forwarded && e.Args.Any(arg => arg.StartsWith($"{ProtocolHelper.Scheme}://", StringComparison.OrdinalIgnoreCase))) + { + MessageBox.Show( + "软件已经在运行,但当前运行的实例是「管理员权限」的,网页无法把运单号传给它。\n\n" + + "请从系统托盘打开软件,或退出后重新启动本软件(新版本会自动改用普通权限运行)。", + "云仓视频溯源软件", MessageBoxButton.OK, MessageBoxImage.Information); + } + Shutdown(); return; } _settings = AppSettings.Load(); + + // 设备服务已改为 Windows 服务 → 通道/扫码记录跟服务共用 ProgramData 下的文件 + // (必须在任何 ChannelStore/ScanRecordStore 访问之前设置) + AgentPaths.MachineMode = _settings.DeviceServiceEnabled && ServiceInstaller.IsInstalled; + if (AgentPaths.MachineMode) + { + AppLog.Write($"[agent] 服务模式:后台服务 {ServiceInstaller.QueryState()},数据目录 {AgentPaths.MachineRoot}"); + } + + // 服务模式(设备服务开着):NTP 校时是强制项,不能停用 + if (_settings.DeviceServiceEnabled) ForceNtpForServiceMode(); + ApplyServerOverride(e.Args); _pendingLaunchUrl = ProtocolHelper.FirstLaunchUrl(e.Args); // ② 本机服务先起来(和登录状态无关) - _server = new LocalHttpServer(new OrderQueryService()); + // 海康设备服务:SDK 只在首次真正用到时初始化(找不到 native\HCNetSDK 也不影响其他接口) + _hik = new HikDeviceService(); + // 运单查询要用户令牌 + 当前主体,登录前这两个都还没有 → 用委托现取 + var queryService = new OrderQueryService(() => _api, () => _settings.SubjectId, () => _session?.Token); + _server = new LocalHttpServer(queryService, _hik); _server.Log += AppLog.Write; // 网页靠 /api/health 里的 loggedIn 判断要不要唤起登录,靠 /api/activate-login 把登录窗叫到前台 _server.IsLoggedInProvider = () => _session is not null; _server.UserNameProvider = () => _session?.DisplayName; _server.ServerBaseUrlProvider = () => _settings.ServerBaseUrl; _server.LoginRequested += OnLoginRequested; + + // 网页查件页的「下载录像」走这里:任何装了本机软件的电脑都能下,存到自己设置的目录 + _server.PlaybackDownload = new PlaybackDownloadService( + queryService, + new HikPlaybackService(_hik), + () => _api, + () => _settings.SubjectId, + () => _session?.Token, + () => _settings.VideoRootResolved); StartLocalServer(); // 启动协议永远指向「当前这个 exe」:换目录/从 Debug 换成发布版/重新安装后, // 旧注册表项会指向一个不存在的或依赖开发环境的 exe(网页“启动本机软件”会直接报错)。 EnsureProtocolRegistered(); + // NTP 校时:**默认不是管理员**(manifest = asInvoker),所以启动/定时校时只在 + // 以管理员身份运行时生效;普通启动时点「立即校时」会单独提权(见 ElevatedNtp)。 + StartNtpSync(); + // 单实例监听要**在登录之前**起来:用户卡在登录窗时被协议唤起,参数也要能进来。 _single.StartListening(); @@ -78,10 +142,7 @@ public partial class App : Application AppLog.Write($"本机服务:{_server.BaseUrl}({(_server.IsRunning ? "运行中" : "未启动")})"); AppLog.Write($"环境:{BuildInfo.EnvironmentLabel},后端:{_settings.ServerBaseUrl}"); - // ④ 检查更新(**不依赖登录**:令牌失效/未登录时也要能更新;放登录之前) - _ = CheckUpdatesAsync(); - - // ⑤ 登录 → 主窗口 + // ④ 登录 → 主窗口 if (!ShowLogin()) { ExitApplication(); @@ -89,6 +150,10 @@ public partial class App : Application } ShowMainWindow(); + + // ⑤ 检查更新(**不依赖登录**状态,但仍要等主窗口起来之后): + // 登录窗是 ShowDialog 模态,先查的话更新窗会被它挡在后面 —— 就是「没有提示更新」的典型现象。 + _ = CheckUpdatesAsync(); } /// @@ -112,6 +177,11 @@ public partial class App : Application // 回归测试用:YUNCANG_AUTO_UPDATE=1 时不点按钮直接开始下载 AutoStart = Environment.GetEnvironmentVariable("YUNCANG_AUTO_UPDATE") == "1", }; + + // 主窗口在显示时才挂 Owner(托盘隐藏状态下挂 Owner,子窗口也会被一起藏掉) + if (_main is { IsVisible: true } main) update.Owner = main; + else update.Topmost = true; + var result = update.ShowDialog(); AppLog.Write($"更新窗口返回:{result}"); if (result == true) @@ -208,6 +278,12 @@ public partial class App : Application if (accepted) { _session = login.Session; + _subjects = login.Subjects; + + // 登录成功后才建接口客户端与设备/扫码服务(设备服务需要用户的令牌去激活) + _api = new ApiClient(_session!.ServerBaseUrl); + _device = new DeviceService(_api, _settings, _session); + _scan = new ScanService(_device); return true; } @@ -245,10 +321,38 @@ public partial class App : Application _loginWindow.Focus(); } - /// 退出登录:清令牌 → 关主窗口 → 重新登录(取消则退出程序) - private void OnLogoutRequested() + /// + /// 退出登录:服务模式只清登录态(后台服务继续跑);普通模式先关设备服务(令牌作废) + /// → 清令牌 → 关主窗口 → 重新登录(取消则退出程序) + /// + private async void OnLogoutRequested() { AppLog.Write("已退出登录"); + + // 开着设备服务时先告知服务器(令牌立即失效),再去清登录态。 + // ⚠️ 服务模式下**不能**关设备服务:后台扫码服务要脱离桌面端继续跑, + // 这里只清登录态,设备令牌和 agent.json 全部保留。 + if (!AgentPaths.MachineMode) + { + try + { + if (_device is not null && _device.Enabled) await _device.DisableAsync(); + } + catch (Exception ex) + { + AppLog.Write($"退出时关闭设备服务失败:{ex.Message}"); + } + _device?.ResetLocalState(); + } + else + { + AppLog.Write("[agent] 退出登录:保留后台扫码服务(不注销设备令牌)"); + _scan?.Stop(); + } + _device = null; + _scan = null; + _api = null; + _subjects = Array.Empty(); SessionStore.Clear(); _session = null; @@ -274,11 +378,14 @@ public partial class App : Application { var server = _server; var session = _session; - if (server is null || session is null) return; + var api = _api; + if (server is null || session is null || api is null) return; if (_main is null) { - _main = new MainWindow(server, _settings, session); + _device ??= new DeviceService(api, _settings, session); + _scan ??= new ScanService(_device); + _main = new MainWindow(server, _settings, session, api, _device, _scan, _hik!, _subjects); _main.LogoutRequested += OnLogoutRequested; _main.HiddenToTray += OnHiddenToTray; _main.RestartRequested += RestartApplication; @@ -322,6 +429,7 @@ public partial class App : Application /// /// 托盘菜单「重启软件」:先让本进程退出(释放单实例互斥体与 17300 端口),2 秒后再拉起自己。 /// 直接用 Process.Start 会撞上单实例检测(新进程把参数转发给正在退出的旧进程后就没了)。 + /// 用 explorer 拉起:即使当前是管理员进程,新实例也会是**普通权限**(否则协议唤起会失效)。 /// private void RestartApplication() { @@ -334,7 +442,7 @@ public partial class App : Application { try { - Process.Start(new ProcessStartInfo("cmd.exe", $"/c timeout /t 2 /nobreak >nul & start \"\" \"{exe}\"") + Process.Start(new ProcessStartInfo("cmd.exe", $"/c timeout /t 2 /nobreak >nul & explorer.exe \"{exe}\"") { CreateNoWindow = true, UseShellExecute = false, @@ -416,12 +524,142 @@ public partial class App : Application }); } + /// + /// 启用 NTP 校时:启动时校一次(可关),运行期按间隔定时校(0 = 只启动时)。 + /// + /// 为什么需要:扫码时间取本机时钟,回放按录像机时间定位; + /// 本机 Windows Time 服务没开时时钟会漂(现场实测慢近 10 秒),面单就会被截到回放窗口外。 + /// + private void StartNtpSync() + { + if (!_settings.NtpEnabled) + { + AppLog.Write("[ntp] NTP 校时已关闭"); + return; + } + + if (!ClockSyncService.IsElevated) + { + AppLog.Write(AgentPaths.MachineMode + ? "[ntp] 服务模式:自动校时由后台服务负责" + : "[ntp] 当前不是管理员权限:跳过启动/定时校时" + + "(在 NTP 窗口点「立即校时」时会单独请求管理员权限)"); + return; + } + + // 服务模式:后台服务(LocalSystem)会按 agent.json 定时校时,本进程不要重复做 + if (AgentPaths.MachineMode) + { + AppLog.Write("[ntp] 服务模式:自动校时由后台服务负责"); + return; + } + + if (_settings.NtpSyncOnStartup) _ = SyncClockAsync("启动"); + + StartNtpTimer(); + } + + /// 启动定时校时(幂等;间隔 0 时只在启动/手动校时) + private void StartNtpTimer() + { + if (_ntpTimer is not null) return; + + var minutes = _settings.NtpSyncIntervalMinutes; + if (minutes <= 0) + { + AppLog.Write("[ntp] 未启用定时校时(间隔 0,只在启动时校时)"); + return; + } + + var interval = TimeSpan.FromMinutes(Math.Max(minutes, 5)); + _ntpTimer = new System.Threading.Timer(_ => _ = SyncClockAsync("定时"), null, interval, interval); + AppLog.Write($"[ntp] 定时校时已启用:每 {interval.TotalMinutes:0} 分钟({_settings.NtpServer})"); + } + + /// + /// 服务模式强制项:启用 NTP + 启动时校时 + 定时间隔 > 0(不能停用自动校时)。 + /// + private void ForceNtpForServiceMode() + { + var changed = false; + + if (!_settings.NtpEnabled) { _settings.NtpEnabled = true; changed = true; } + if (!_settings.NtpSyncOnStartup) { _settings.NtpSyncOnStartup = true; changed = true; } + if (_settings.NtpSyncIntervalMinutes <= 0) { _settings.NtpSyncIntervalMinutes = 30; changed = true; } + + if (changed) + { + _settings.Save(); + AppLog.Write("[ntp] 服务模式:NTP 校时已强制开启(启用 + 启动校时 + 定时校时)"); + } + } + + /// + /// 供主窗口在「开启设备服务」后调用:强制服务模式 NTP 设置并确保定时校时在跑(幂等)。 + /// + public void EnsureNtpSync() + { + ForceNtpForServiceMode(); + + if (!_settings.NtpEnabled) return; + if (!ClockSyncService.IsElevated) + { + if (!AgentPaths.MachineMode) + { + AppLog.Write("[ntp] 服务模式:当前不是管理员权限,自动校时未启动" + + "(在 NTP 窗口点「立即校时」可单独提权校时一次)"); + } + return; + } + + _ = SyncClockAsync("服务模式"); + StartNtpTimer(); + } + + /// 查询 NTP 并校准本机时钟(失败只记日志,不影响其他功能)。 + private async Task SyncClockAsync(string reason) + { + if (!_settings.NtpEnabled) return; + if (!await _ntpGate.WaitAsync(0).ConfigureAwait(false)) return; + + try + { + var result = await ClockSyncService.SyncAsync(_settings.NtpServer).ConfigureAwait(false); + + _settings.NtpLastSyncAt = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + _settings.NtpLastOffsetSeconds = Math.Round(result.Offset.TotalSeconds, 2); + _settings.Save(); + + AppLog.Write(result.Offset.Duration() < ClockSyncService.MinimumAdjust + ? $"[ntp] {reason}校时:{_settings.NtpServer} 偏差 {result.Offset.TotalSeconds:+0.00;-0.00} 秒(已在误差范围内,未调整)" + : $"[ntp] {reason}校时完成:{_settings.NtpServer} 偏差 {result.Offset.TotalSeconds:+0.00;-0.00} 秒,往返 {result.RoundTrip.TotalMilliseconds:0} ms"); + } + catch (Exception ex) + { + AppLog.Write($"[ntp] {reason}校时失败({_settings.NtpServer}):{ex.Message}"); + } + finally + { + _ntpGate.Release(); + } + } + /// 真正退出(托盘菜单 / 登录取消 / 退出登录后取消登录) private void ExitApplication() { if (_exiting) return; _exiting = true; + try + { + _ntpTimer?.Dispose(); + _ntpTimer = null; + } + catch + { + // 退出路径忽略 + } + try { _tray?.Dispose(); @@ -440,13 +678,24 @@ public partial class App : Application // 退出路径忽略 } + try + { + _hik?.Dispose(); + } + catch + { + // 退出路径忽略 + } + Shutdown(); } protected override void OnExit(ExitEventArgs e) { + _ntpTimer?.Dispose(); _tray?.Dispose(); _server?.Dispose(); + _hik?.Dispose(); _single?.Dispose(); base.OnExit(e); } diff --git a/desktop/LoginWindow.xaml b/desktop/LoginWindow.xaml index 14c6dcc..3e9f33e 100644 --- a/desktop/LoginWindow.xaml +++ b/desktop/LoginWindow.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Title="登录 · 云仓视频溯源软件" - Height="500" Width="430" + Height="580" Width="440" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Background="{StaticResource BgBrush}" @@ -14,32 +14,66 @@ + HorizontalAlignment="Center" Margin="0,6,0,16" /> - - - - + + + + + + + + + + + + + + + + + + +