桌面端
- 新增 LocalWsServer(ws://127.0.0.1:17301):hello / ping / get_channels /
start_preview / stop_preview / open_window / close_window / ptz / ptz_preset,
一条连接可同时推多路 JPEG 帧(帧头带 sid);慢命令并发派发,云台命令按连接串行,
页面断开自动清理会话与满帧率窗口
- LocalHttpServer 删除预览(MJPEG/快照/满帧率窗口)、/api/hik/channels、/api/hik/ptz*,
HTTP 17300 只保留 /api/query/{code}、/api/activate-login、/api/playback/download,
其余 POST 统一回 404 并提示已迁到 WS;不再依赖 HCNetSDK
- App 自行组装 HikStreamService -> HikPreviewService + HikNativePreviewService 注入 WS
- 后台服务加固:框架依赖(开发版)安装/启动时自动写服务环境变量 DOTNET_ROOT,
避免 LocalSystem 找不到用户目录里的 .NET 8 而报「后台服务启动超时」
前端
- 新增 api/localWs.ts(连接/断线/请求-响应/二进制帧分发),补 getChannels / openWindow /
closeWindow / ptz / ptzPreset
- CamerasView 预览只走 WS(保留「唤起本机软件 -> 等待 -> 提示安装」兜底),
满帧率窗口、云台、预置点改走 WS
- NvrsView 拉取通道改走 WS(连不上时自动唤起一次再重试)
- CameraLayoutCanvas 合成画面 4 路改 WS 推帧
- 删除 createHikPreview/closeHikPreview*/openHikWindow/closeHikWindow*/ptzControl/ptzPreset
与 isLocalServiceAlive/waitForLocalService
其他
- 移除 cameras.has_ptz(迁移 20261019233000)与相关接口/字段/UI
- 通道号按 struStreamMode 映射(IP 通道空槽导致 51 之后整体错位)
- 扫码 24 小时内只保留最后一次扫描(后上报时间更新时覆盖)
- 清理历史 DESKTOP 占位通道(迁移 20261019230000)
- README / desktop README 补 17301 与 WS 接口说明,修正已删除的 /api/health 描述
75 lines
4.7 KiB
XML
75 lines
4.7 KiB
XML
<UserControl x:Class="YuncangTrace.LocalService.Views.ScanRecordsView"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
FontFamily="Microsoft YaHei UI, Segoe UI" FontSize="13">
|
|
<Grid Margin="0,8,0,0">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto" />
|
|
<RowDefinition Height="*" />
|
|
<RowDefinition Height="Auto" />
|
|
</Grid.RowDefinitions>
|
|
|
|
<!-- 标题行:筛选 + 状态 + 按钮(与其他页签一致,全都挤在标题行上) -->
|
|
<DockPanel Grid.Row="0" Margin="0,0,0,8" LastChildFill="False">
|
|
<TextBlock DockPanel.Dock="Left" Text="扫码记录" FontWeight="SemiBold" VerticalAlignment="Center" />
|
|
<StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Margin="12,0,0,0">
|
|
<ComboBox x:Name="ChannelFilter" Width="170" Height="26" Padding="6,2"
|
|
DisplayMemberPath="Label" SelectionChanged="ChannelFilter_SelectionChanged" />
|
|
<Button x:Name="UploadButton" Content="立即上传" Padding="10,3" Margin="8,0,0,0"
|
|
Click="Upload_Click" />
|
|
<Button x:Name="ClearButton" Content="清空" Padding="10,3" Margin="8,0,0,0" Click="Clear_Click" />
|
|
</StackPanel>
|
|
<TextBlock x:Name="StatusText" DockPanel.Dock="Right" Foreground="{StaticResource MutedBrush}"
|
|
VerticalAlignment="Center" HorizontalAlignment="Right" TextTrimming="CharacterEllipsis"
|
|
Text="—" />
|
|
</DockPanel>
|
|
|
|
<Border Grid.Row="1" Background="White" BorderBrush="{StaticResource LineBrush}" BorderThickness="1"
|
|
CornerRadius="8" Padding="8">
|
|
<ListView x:Name="RecordList" BorderThickness="0" SelectionMode="Single">
|
|
<ListView.View>
|
|
<GridView>
|
|
<GridViewColumn Header="时间" Width="130" DisplayMemberBinding="{Binding TimeText}" />
|
|
<GridViewColumn Header="通道" Width="150" DisplayMemberBinding="{Binding ChannelName}" />
|
|
<GridViewColumn Header="号" Width="46" DisplayMemberBinding="{Binding ChannelId}" />
|
|
<GridViewColumn Header="条码" Width="300" DisplayMemberBinding="{Binding Code}" />
|
|
<GridViewColumn Header="上传" Width="80" DisplayMemberBinding="{Binding UploadText}" />
|
|
<GridViewColumn Header="确认时间" Width="130" DisplayMemberBinding="{Binding UploadedAtText}" />
|
|
</GridView>
|
|
</ListView.View>
|
|
</ListView>
|
|
</Border>
|
|
|
|
<!-- 分页条:本地每通道最多 5000 条,一次全渲染会卡 -->
|
|
<DockPanel Grid.Row="2" Margin="0,8,0,0" LastChildFill="False">
|
|
<StackPanel DockPanel.Dock="Left" Orientation="Horizontal">
|
|
<Button x:Name="FirstButton" Content="首页" Padding="10,3" Click="First_Click" />
|
|
<Button x:Name="PrevButton" Content="上一页" Padding="10,3" Margin="6,0,0,0" Click="Prev_Click" />
|
|
<TextBlock x:Name="PageText" Text="第 1 / 1 页" VerticalAlignment="Center"
|
|
Margin="12,0,12,0" Foreground="{StaticResource MutedBrush}" />
|
|
<Button x:Name="NextButton" Content="下一页" Padding="10,3" Margin="0,0,6,0" Click="Next_Click" />
|
|
<Button x:Name="LastButton" Content="末页" Padding="10,3" Click="Last_Click" />
|
|
|
|
<TextBox x:Name="JumpBox" Width="64" Height="26" Padding="6,2" Margin="12,0,0,0"
|
|
VerticalContentAlignment="Center" KeyDown="JumpBox_KeyDown"
|
|
ToolTip="输入页码后回车" />
|
|
<Button Content="跳转" Padding="10,3" Margin="6,0,0,0" Click="Jump_Click" />
|
|
</StackPanel>
|
|
|
|
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center">
|
|
<TextBlock Text="每页" VerticalAlignment="Center" Foreground="{StaticResource MutedBrush}"
|
|
Margin="0,0,6,0" />
|
|
<ComboBox x:Name="PageSizeBox" Width="80" Height="26" Padding="6,2"
|
|
SelectionChanged="PageSizeBox_SelectionChanged">
|
|
<ComboBoxItem Content="100" />
|
|
<ComboBoxItem Content="200" />
|
|
<ComboBoxItem Content="500" />
|
|
<ComboBoxItem Content="1000" />
|
|
</ComboBox>
|
|
<TextBlock Text="条" VerticalAlignment="Center" Foreground="{StaticResource MutedBrush}"
|
|
Margin="6,0,0,0" />
|
|
</StackPanel>
|
|
</DockPanel>
|
|
</Grid>
|
|
</UserControl>
|