zhangxy
/
RFIDmonitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.调整UI

Browse Source
master
zhangxy 4 days ago
parent 950109260e
commit 865fb34ba5
4 changed files with 100 additions and 69 deletions
Show Stats Download Patch File Download Diff File

3
SocketExample/RFIDmonitor.csproj
Unescape Escape View File

@ -269,6 +269,9 @@
<Resource Include="取消全屏.png" />
<Resource Include="海威图标-竖.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="新增.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

124
SocketExample/TCPWindowV2.xaml
Unescape Escape View File

@ -8,7 +8,7 @@
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
xmlns:local="clr-namespace:SocketExample"
mc:Ignorable="d"
Title="RFID读写器多终端监控软件v1.08" Height="680" Width="1180"
Title="RFID读写器多终端监控软件v1.091" Height="680" Width="1180"
Background="Transparent" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterScreen">
<Window.Resources>
@ -88,37 +88,44 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" CornerRadius="20" Background="{StaticResource PrimaryBrush}" Margin="10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="10 0 0 0" VerticalAlignment="Center">
<TextBlock Text="监控终端生成数量:" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White" FontSize="15" FontWeight="SemiBold"/>
<TextBox x:Name="CountTextBox" Width="100" Margin="0,0,10,0" VerticalAlignment="Center" FontSize="15" FontWeight="SemiBold"/>
<Button Content="生成" Click="GenerateButton_Click" Height="40" Width="50" Margin="10 0 0 0" Style="{StaticResource FlatButton}"/>
<Button Content="清空" Click="ClearButton_Click" Height="40" Width="50" Margin="10 0 0 0" Style="{StaticResource FlatButton}"/>
</StackPanel>
<StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical">
<TextBlock Text="RFID设备监控平台" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" FontSize="25" FontWeight="SemiBold"/>
</StackPanel>
<Grid Grid.Column="2" HorizontalAlignment="Right" Margin="0 0 10 0" VerticalAlignment="Center">
<TextBlock Text="RFID设备监控平台" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" FontSize="38" FontWeight="SemiBold"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Button x:Name="Minimize_Button" Grid.Column="0" Height="40" Width="50" Style="{StaticResource FlatButton}" Margin="0 0 0 0" Click="Minimize_Button_Click">
<Image Source="/减号.png" />
</Button>
<Button x:Name="Maxmize_Button" Grid.Column="1" Height="40" Width="50" Style="{StaticResource FlatButton}" Margin="0 0 0 0" Click="Maxmize_Button_Click">
<Image x:Name="MaxMinImage" Source="/全屏.png"/>
</Button>
<Button x:Name="Shutdown_Button" Grid.Column="2" Height="40" Width="50" Style="{StaticResource FlatButton}" Click="Shutdown_Button_Click">
<Image Source="/关闭.png"/>
</Button>
<Grid Grid.Column="0" >
<StackPanel x:Name="Welcome_StackPanel" Orientation="Horizontal" Visibility="Hidden">
<Button x:Name="CreateTerminal_Button" Height="40" Width="50" Margin="10 0 0 0" Style="{StaticResource FlatButton}" Click="CreateTerminal_Button_Click">
<Image Source="/新增.png"/>
</Button>
<Image Source="/海威图标-横.png" Margin="2 14 14 13"/>
</StackPanel>
<StackPanel x:Name="NewTerminal_StackPanel" Orientation="Horizontal" Margin="10 0 0 0" VerticalAlignment="Center">
<TextBlock Text="监控终端生成数量:" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White" FontSize="15" FontWeight="SemiBold"/>
<TextBox x:Name="CountTextBox" Width="100" Margin="0,0,10,0" VerticalAlignment="Center" FontSize="15" FontWeight="SemiBold"/>
<Button Content="生成" Click="GenerateButton_Click" Height="40" Width="50" Margin="10 0 0 0" Style="{StaticResource FlatButton}"/>
<Button Content="清空" Click="ClearButton_Click" Height="40" Width="50" Margin="10 0 0 0" Style="{StaticResource FlatButton}"/>
</StackPanel>
</Grid>
<Grid Grid.Column="1" HorizontalAlignment="Right" Margin="0 0 10 0" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button x:Name="Minimize_Button" Grid.Column="0" Height="40" Width="50" Style="{StaticResource FlatButton}" Margin="0 0 0 0" Click="Minimize_Button_Click">
<Image Source="/减号.png" />
</Button>
<Button x:Name="Maxmize_Button" Grid.Column="1" Height="40" Width="50" Style="{StaticResource FlatButton}" Margin="0 0 0 0" Click="Maxmize_Button_Click">
<Image x:Name="MaxMinImage" Source="/全屏.png"/>
</Button>
<Button x:Name="Shutdown_Button" Grid.Column="2" Height="40" Width="50" Style="{StaticResource FlatButton}" Click="Shutdown_Button_Click">
<Image Source="/关闭.png"/>
</Button>
</Grid>
</Grid>
</Grid>
</Border>
@ -192,37 +199,32 @@
<Border BorderThickness="0.5" CornerRadius="10" BorderBrush="Black" Padding="2.5 3 2.5 3" Margin="0.5 1 0.5 1">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">
<Grid Margin="0.5">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Label Content="接收消息:"/>
<TextBlock Text="{Binding OriginMessage}" VerticalAlignment="Center"></TextBlock>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="0 0 5 0">
<Label Content="标签:" FontWeight="Bold"/>
<TextBlock Text="{Binding EPCinfo}" FontSize="15" FontWeight="Bold" Foreground="{Binding InfoColor}" VerticalAlignment="Center" FontFamily="Tahoma"></TextBlock>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal">
<Label Content="标签:"/>
<TextBlock Text="{Binding EPCinfo}" FontSize="15" FontWeight="Bold" Foreground="{Binding InfoColor}" VerticalAlignment="Center"></TextBlock>
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0 0 5 0">
<Label Content="HEX:" FontWeight="Bold"/>
<TextBlock Text="{Binding EPCASC}" VerticalAlignment="Center" FontFamily="Tahoma"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal">
<Label Content="HEX:"/>
<TextBlock Text="{Binding EPCASC}" VerticalAlignment="Center"></TextBlock>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0 0 5 0">
<Label Content="RSSI:" FontWeight="Bold"/>
<TextBlock Text="{Binding RSSIinfo}" VerticalAlignment="Center" FontFamily="Tahoma"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal">
<StackPanel Grid.Column="0" Orientation="Horizontal">
<Label Content="RSSI:"/>
<TextBlock Text="{Binding RSSIinfo}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<Label Margin="5 0 0 0" Content="Count:"/>
<TextBlock Text="{Binding Countinfo}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal">
<Label Margin="5 0 0 0" Content="Time:"/>
<TextBlock Text="{Binding Timeinfo}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Column="3" Orientation="Horizontal" Margin="0 0 5 0">
<Label Margin="5 0 0 0" Content="Count:" FontWeight="Bold"/>
<TextBlock Text="{Binding Countinfo}" VerticalAlignment="Center" FontFamily="Tahoma"/>
</StackPanel>
<StackPanel Grid.Column="4" Orientation="Horizontal">
<Label Margin="5 0 0 0" Content="Time:" FontWeight="Bold"/>
<TextBlock Text="{Binding Timeinfo}" VerticalAlignment="Center" FontFamily="Tahoma"/>
</StackPanel>
</Grid>
</ScrollViewer>
@ -514,10 +516,10 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="模块型号：" HorizontalAlignment="Left" FontSize="14" />
<Label Grid.Column="1" Content="{Binding moduleInfo}"></Label>
<Label Grid.Column="2" Content="主板固件号：" HorizontalAlignment="Left" FontSize="14" />
<Label Grid.Column="3" Content="{Binding motherboardFirmware}"></Label>
<Label Grid.Column="0" Content="模块型号：" HorizontalAlignment="Left" FontSize="13" FontWeight="Bold"/>
<Label Grid.Column="1" Content="{Binding moduleInfo}" VerticalContentAlignment="Center"></Label>
<Label Grid.Column="2" Content="主板固件号：" HorizontalAlignment="Left" FontSize="13" FontWeight="Bold"/>
<Label Grid.Column="3" Content="{Binding motherboardFirmware}" VerticalContentAlignment="Center"></Label>
</Grid>
</Grid>

42
SocketExample/TCPWindowV2.xaml.cs
Unescape Escape View File

@ -207,9 +207,9 @@ namespace SocketExample
//页面初始化
int[] Powerdatasource = { 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33 };
string[] GPOdatasource = { "高", "低" };
string[] SendTextdatasource = { "单次读取", "时间段盘点" };
string[] SendTextdatasource = { "单次盘点", "时间段盘点" };
Borderwidth = ((int)SystemParameters.PrimaryScreenWidth - 60) / 4; //动态生成界面宽度
Borderwidth = GetTerminalWidth(); //动态生成界面宽度
MessageText = string.Empty;
IPtext = "192.168.0.7";//默认IP
Porttext = "20108";//默认端口
@ -265,7 +265,7 @@ namespace SocketExample
Text = Text.Replace(" ", "");
path = "";
string time = DateTime.Now.ToString();
string currentTime = time.Substring(9, time.Length - 9);
string currentTime = DateTime.Now.ToString("T");
var mes = e.ByteBlock.Span.ToString(Encoding.UTF8);
byte[] data = e.ByteBlock.Span.ToArray();
string hexString = BitConverter.ToString(data).Replace("-", " ");
@ -276,7 +276,7 @@ namespace SocketExample
string commandState = readStateString.Substring(6, 2);//获取命令
if (commandState != "81")
Infotext += $"({currentTime})客户端接收到信息：\n{hexString}\n\n";
Infotext += $"({currentTime})客户端接收到信息：\n{hexString}\n";
int i = Convert.ToInt32(dataLength, 16);
if (i != 0)
@ -650,6 +650,24 @@ namespace SocketExample
throw new NotImplementedException();
}
public int GetTerminalWidth()
{
int number = 4;
int width = ((int)SystemParameters.PrimaryScreenWidth - 60) / number;
while(width<360 || width > 700){
if (width < 360)
{
number--;
}
else if(width >700)
{
number++;
}
width = ((int)SystemParameters.PrimaryScreenWidth - 60) / number;
}
return width;
}
static void GetGPIOThread(ITcpClient client)
{
byte[] data = strToToHexByte("AA 55 00 81 81 0D");//获取GPIO状态
@ -859,8 +877,8 @@ namespace SocketExample
byte[] data = null;
switch (message)
{
case "单次读取":
ActionType = "单次读取";
case "单次盘点":
ActionType = "单次盘点";
data = strToToHexByte(CheckForOnce());//单次
break;
/*
@ -1000,8 +1018,8 @@ namespace SocketExample
//byte[] data = null;
switch (selcetion)
{
case "单次读取":
ActionType = "单次读取";
case "单次盘点":
ActionType = "单次盘点";
//data = strToToHexByte("AA 55 02 01 00 64 67 0D");//单次
break;
/*
@ -1214,12 +1232,19 @@ namespace SocketExample
{
MessageBox.Show("请输入有效的正整数", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
}
Welcome_StackPanel.Visibility = Visibility.Visible;
NewTerminal_StackPanel.Visibility = Visibility.Collapsed;
}
private void Shutdown_Button_Click(object sender, RoutedEventArgs e)
{
Application.Current.Shutdown();
}
private void CreateTerminal_Button_Click(object sender, RoutedEventArgs e)
{
Welcome_StackPanel.Visibility = Visibility.Collapsed;
NewTerminal_StackPanel.Visibility = Visibility.Visible;
}
private void Maxmize_Button_Click(object sender, RoutedEventArgs e)
{
@ -1512,5 +1537,6 @@ namespace SocketExample
WindowHeight = this.Height;
OriginWindowState = this.WindowState;
}
}
}

BIN
SocketExample/新增.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

Write Preview
Loading…
Cancel
Save