桌面端
- 新增 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 描述
96 lines
6.3 KiB
XML
96 lines
6.3 KiB
XML
<UserControl x:Class="YuncangTrace.LocalService.Views.ScanTabView"
|
||
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="*" />
|
||
<RowDefinition Height="Auto" />
|
||
<RowDefinition Height="160" />
|
||
<RowDefinition Height="Auto" />
|
||
</Grid.RowDefinitions>
|
||
|
||
<!-- 通道列表(状态 + 按钮都在标题行) -->
|
||
<Border Grid.Row="0" Background="White" BorderBrush="{StaticResource LineBrush}" BorderThickness="1"
|
||
CornerRadius="8" Padding="8">
|
||
<DockPanel>
|
||
<DockPanel DockPanel.Dock="Top" Margin="2,0,0,6" LastChildFill="False">
|
||
<TextBlock DockPanel.Dock="Left" Text="扫码通道" FontWeight="SemiBold"
|
||
VerticalAlignment="Center" />
|
||
<StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Margin="12,0,0,0">
|
||
<Button x:Name="ReconnectButton" Content="重连全部" Padding="10,3" Click="Reconnect_Click" />
|
||
<Button x:Name="MuteButton" Content="静音" Padding="10,3" Margin="8,0,0,0" Click="Mute_Click" />
|
||
<Button x:Name="ConfigButton" Content="读取设备配置" Padding="10,3" Margin="8,0,0,0" Click="ReadConfig_Click" />
|
||
<Button x:Name="RawCommandButton" Content="串口指令…" Padding="10,3" Margin="8,0,0,0" Click="RawCommand_Click" />
|
||
<Button x:Name="RemoveButton" Content="删除通道" Padding="10,3" Margin="8,0,0,0" Click="Remove_Click" />
|
||
</StackPanel>
|
||
<TextBlock x:Name="ChannelStatusText" DockPanel.Dock="Right" Foreground="{StaticResource MutedBrush}"
|
||
VerticalAlignment="Center" HorizontalAlignment="Right" TextTrimming="CharacterEllipsis"
|
||
Text="通道 = 一台扫码设备;收到条码会自动上报到服务器" />
|
||
</DockPanel>
|
||
<ListView x:Name="ChannelList" BorderThickness="0" SelectionMode="Single"
|
||
SelectionChanged="ChannelList_SelectionChanged">
|
||
<ListView.View>
|
||
<GridView>
|
||
<GridViewColumn Header="号" Width="46" DisplayMemberBinding="{Binding Number}" />
|
||
<GridViewColumn Header="名称" Width="150" DisplayMemberBinding="{Binding DisplayName}" />
|
||
<GridViewColumn Header="MAC" Width="130" DisplayMemberBinding="{Binding Mac}" />
|
||
<GridViewColumn Header="IP" Width="120" DisplayMemberBinding="{Binding LastIp}" />
|
||
<GridViewColumn Header="状态" Width="70" DisplayMemberBinding="{Binding StateText}" />
|
||
<GridViewColumn Header="静音" Width="70" DisplayMemberBinding="{Binding MuteText}" />
|
||
<GridViewColumn Header="最近条码" Width="220" DisplayMemberBinding="{Binding LastCode}" />
|
||
</GridView>
|
||
</ListView.View>
|
||
</ListView>
|
||
</DockPanel>
|
||
</Border>
|
||
|
||
<!-- 发现到的设备(状态 + 按钮都在标题行) -->
|
||
<DockPanel Grid.Row="1" Margin="0,10,0,6" LastChildFill="False">
|
||
<TextBlock DockPanel.Dock="Left" Text="发现到的设备(局域网 UDP 48899)" FontWeight="SemiBold"
|
||
VerticalAlignment="Center" />
|
||
<StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Margin="12,0,0,0">
|
||
<ToggleButton x:Name="DiscoverToggle" Content="开始扫描" Padding="10,3" Click="Discover_Toggle" />
|
||
<Button x:Name="AddButton" Content="添加为通道" Padding="10,3" Margin="8,0,0,0" Click="Add_Click" />
|
||
</StackPanel>
|
||
<TextBlock x:Name="DiscoverStatusText" DockPanel.Dock="Right" Foreground="{StaticResource MutedBrush}"
|
||
VerticalAlignment="Center" HorizontalAlignment="Right" TextTrimming="CharacterEllipsis"
|
||
Text="未开始扫描" />
|
||
</DockPanel>
|
||
|
||
<Border Grid.Row="2" Background="White" BorderBrush="{StaticResource LineBrush}" BorderThickness="1"
|
||
CornerRadius="8" Padding="8">
|
||
<ListView x:Name="DeviceList" BorderThickness="0" SelectionMode="Single">
|
||
<ListView.View>
|
||
<GridView>
|
||
<GridViewColumn Header="设备名" Width="140" DisplayMemberBinding="{Binding HostName}" />
|
||
<GridViewColumn Header="IP" Width="130" DisplayMemberBinding="{Binding Ip}" />
|
||
<GridViewColumn Header="MAC" Width="130" DisplayMemberBinding="{Binding Mac}" />
|
||
<GridViewColumn Header="型号" Width="90" DisplayMemberBinding="{Binding Model}" />
|
||
<GridViewColumn Header="版本" Width="90" DisplayMemberBinding="{Binding Version}" />
|
||
</GridView>
|
||
</ListView.View>
|
||
</ListView>
|
||
</Border>
|
||
|
||
<!-- 设备配置 -->
|
||
<Border Grid.Row="3" Background="#F8FAFC" BorderBrush="{StaticResource LineBrush}" BorderThickness="1"
|
||
CornerRadius="8" Padding="10" Margin="0,8,0,0">
|
||
<Grid>
|
||
<Grid.ColumnDefinitions>
|
||
<ColumnDefinition Width="*" />
|
||
<ColumnDefinition Width="Auto" />
|
||
</Grid.ColumnDefinitions>
|
||
<StackPanel Grid.Column="0">
|
||
<TextBlock Text="设备配置(选中通道后点「读取设备配置」)" FontWeight="SemiBold" Margin="0,0,0,6" />
|
||
<TextBlock x:Name="ConfigText" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap"
|
||
Text="—" FontFamily="Consolas, Microsoft YaHei UI" FontSize="12" />
|
||
</StackPanel>
|
||
<StackPanel Grid.Column="1" VerticalAlignment="Bottom">
|
||
<Button x:Name="RestartButton" Content="重启设备" Padding="12,4" Click="Restart_Click" />
|
||
</StackPanel>
|
||
</Grid>
|
||
</Border>
|
||
</Grid>
|
||
</UserControl>
|