AndroidStation - 有的扫码枪(Newtologic DW-8200,T95MAX/Android 12)用 KEYCODE_DPAD_CENTER 当结束键, 之前只认 ENTER/TAB:结束键会落到当前焦点按钮上(一扫就进「服务设置」,焦点在 「清空记录」时还会清空记录),而且扫码只能等 50ms 超时才提交。现在按 deviceId 认 “刚发过条码字符的那台设备”,DPAD_CENTER 也算结束键,遥控器 OK 键不受影响。 - 新增「播报走本机扬声器(AV / 3.5mm)」开关(默认关):个别机型插 HDMI 时 HAL 会把 媒体声音锁在 HDMI 声卡,需要显式指定内建扬声器。 桌面端 - 发现列表改为按 MAC 就地合并,不再整表 Clear(每 3 秒一次刷新会把 ListView 的选中项 和滚动位置清掉,现场表现为“设备选不中”)。 - 「添加为通道」从标题行移到列表行内「操作」列,不再依赖选中项。 后端 - NVR 唯一键由全局 (host, port, username) 改为 (subject_id, host, port, username): 不同仓库的内网地址经常相同,之前会报「已被其他主体添加」。查重也只查本主体。 - 新增迁移 20261116010000-scope-nvr-unique-to-subject 与按主体范围的测试。 构建 - android_client/build.ps1:gradle 把 javac 的 stderr 提示写出来时,PowerShell 的 $ErrorActionPreference='Stop' 会把它当终止错误,release 包必失败;改为只以退出码判定。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
133 lines
8.7 KiB
XML
133 lines
8.7 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">
|
||
<UserControl.Resources>
|
||
<!-- 安卓扫描通道用蓝色加粗标出来;普通扫码枪保持灰色 -->
|
||
<Style x:Key="KindTextStyle" TargetType="TextBlock">
|
||
<Setter Property="Foreground" Value="#64748B" />
|
||
<Setter Property="VerticalAlignment" Value="Center" />
|
||
<Style.Triggers>
|
||
<DataTrigger Binding="{Binding KindText}" Value="安卓扫描通道">
|
||
<Setter Property="Foreground" Value="#2563EB" />
|
||
<Setter Property="FontWeight" Value="SemiBold" />
|
||
</DataTrigger>
|
||
</Style.Triggers>
|
||
</Style>
|
||
</UserControl.Resources>
|
||
|
||
<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="RenameButton" Content="重命名" Padding="10,3" Margin="8,0,0,0" Click="Rename_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="类型" Width="110">
|
||
<GridViewColumn.CellTemplate>
|
||
<DataTemplate>
|
||
<TextBlock Text="{Binding KindText}" Style="{StaticResource KindTextStyle}"
|
||
ToolTip="安卓扫描通道:摄像头识别到条码时会收到「扫码成功」通知并语音播报;扫码枪通道无语音能力,不发通知(记录照常上报)" />
|
||
</DataTemplate>
|
||
</GridViewColumn.CellTemplate>
|
||
</GridViewColumn>
|
||
<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" />
|
||
</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="类型" Width="110">
|
||
<GridViewColumn.CellTemplate>
|
||
<DataTemplate>
|
||
<TextBlock Text="{Binding KindText}" Style="{StaticResource KindTextStyle}" />
|
||
</DataTemplate>
|
||
</GridViewColumn.CellTemplate>
|
||
</GridViewColumn>
|
||
<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}" />
|
||
<GridViewColumn Header="操作" Width="90">
|
||
<GridViewColumn.CellTemplate>
|
||
<DataTemplate>
|
||
<Button Content="添加" Padding="10,2" Click="AddRow_Click"
|
||
ToolTip="把这台设备添加为扫码通道(弹窗里再定通道号与设备名)" />
|
||
</DataTemplate>
|
||
</GridViewColumn.CellTemplate>
|
||
</GridViewColumn>
|
||
</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>
|