From 7b4705c73cb3588bbf6950e372f560a770b55534 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 22 Oct 2026 03:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E6=9C=AC=E6=9C=BA=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BD=95=E5=83=8F=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 校验循环里在判断 peer 之前就调了 _playback.ClockOffset(),而它内部会 初始化 HCNetSDK 并登录 NVR —— 于是「走设备管理服务」之后本机又登了一次, 既出现「明明检查过又检查一遍」的观感,也正好抵消了共用会话池的意义 (海康并发登录通常只有 6~16)。 - 时钟对齐挪进 peer is null 的本机分支 - 走边端时结果行标注「(设备管理服务)」,本机不碰录像机 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- desktop/MainWindow.xaml.cs | 37 ++++++++++++++---------- desktop/YuncangTrace.LocalService.csproj | 2 +- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/desktop/MainWindow.xaml.cs b/desktop/MainWindow.xaml.cs index 984d32a..abfacdd 100644 --- a/desktop/MainWindow.xaml.cs +++ b/desktop/MainWindow.xaml.cs @@ -1348,15 +1348,8 @@ public partial class MainWindow : Window { var credential = await CredentialAsync(stream.NvrId, ct); - // 本机与录像机时钟不一致时,回放会整体错位(短窗口甚至直接截掉面单) - var clock = _playback.ClockOffset(credential.Host, credential.Port, - credential.Username, credential.Password); - if (clockNoted.Add(stream.NvrId) && Math.Abs(clock.TotalSeconds) >= 2) - { - lines.Add($"[时钟] 录像机与本机相差 {clock.TotalSeconds:+0.0;-0.0} 秒,回放时间已按录像机对齐"); - ShowPlayback(string.Join(Environment.NewLine, lines)); - } - + // 时钟对齐只有**本机直连录像机**时才需要(回放会整体错位)。 + // 走设备管理服务时本机不该登录 NVR —— 那正是「共用会话池」要避免的并发登录。 var hasRecord = false; var frames = 0; string? error = null; @@ -1384,21 +1377,35 @@ public partial class MainWindow : Window if (peer is null) { + // 本机直连:先和录像机对时(否则短窗口会整体错位甚至截掉面单) + var clock = _playback.ClockOffset(credential.Host, credential.Port, + credential.Username, credential.Password); + if (clockNoted.Add(stream.NvrId) && Math.Abs(clock.TotalSeconds) >= 2) + { + lines.Add($"[时钟] 录像机与本机相差 {clock.TotalSeconds:+0.0;-0.0} 秒,回放时间已按录像机对齐"); + ShowPlayback(string.Join(Environment.NewLine, lines)); + } + var check = await _playback.CheckAsync(credential.Host, credential.Port, credential.Username, credential.Password, stream.ChannelNo, stream.StartTime, stream.EndTime, ct); hasRecord = check.HasRecord; frames = check.Frames; error = check.Error; + + lines.Add(hasRecord + ? $"[有录像] {stream.DisplayName} {FormatRange(stream, clock)}{(frames > 0 ? $" 试拉 {frames} 帧" : "")}" + : $"[无录像] {stream.DisplayName} {FormatRange(stream, clock)} {error}"); + } + else + { + // 走设备管理服务:只报结果,本机不碰录像机 + lines.Add(hasRecord + ? $"[有录像] {stream.DisplayName} {FormatRange(stream, TimeSpan.Zero)}(设备管理服务){(frames > 0 ? $" 试拉 {frames} 帧" : "")}" + : $"[无录像] {stream.DisplayName} {FormatRange(stream, TimeSpan.Zero)} {error}(设备管理服务)"); } if (hasRecord) valid.Add(stream); - - // SDK 路径不数帧(返回 -1),只有 RTSP 兜底才有帧数 - var frameText = frames > 0 ? $" 试拉 {frames} 帧" : ""; - lines.Add(hasRecord - ? $"[有录像] {stream.DisplayName} {FormatRange(stream, clock)}{frameText}" - : $"[无录像] {stream.DisplayName} {FormatRange(stream, clock)} {error}"); } catch (Exception ex) { diff --git a/desktop/YuncangTrace.LocalService.csproj b/desktop/YuncangTrace.LocalService.csproj index 74c7f5f..405f023 100644 --- a/desktop/YuncangTrace.LocalService.csproj +++ b/desktop/YuncangTrace.LocalService.csproj @@ -42,7 +42,7 @@ http://127.0.0.1:7300 https://packs.example.com - 1.0.110 + 1.0.111 浜戜粨瑙嗛婧簮杞欢 浜戜粨 浜戜粨瑙嗛婧簮杞欢锛堟湰鏈烘湇鍔★級