diff --git a/SocketExample/RFIDmonitor.csproj b/SocketExample/RFIDmonitor.csproj
index 45a0c96..cd8b0c5 100644
--- a/SocketExample/RFIDmonitor.csproj
+++ b/SocketExample/RFIDmonitor.csproj
@@ -262,6 +262,13 @@
+
+
+
+
+
+
+
diff --git a/SocketExample/TCPWindowV2.xaml b/SocketExample/TCPWindowV2.xaml
index 3e43270..40ce6cd 100644
--- a/SocketExample/TCPWindowV2.xaml
+++ b/SocketExample/TCPWindowV2.xaml
@@ -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.07" Height="450" Width="800"
+ Title="RFID读写器多终端监控软件v1.08" Height="680" Width="1180"
Background="Transparent" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterScreen">
@@ -63,6 +63,7 @@
+
-
+
+
+
@@ -97,15 +101,24 @@
-
+
+
+
+
-
-
-
+
+
+
@@ -191,7 +204,7 @@
-
+
@@ -225,7 +238,7 @@
-
+
-
+
-
+
-
+
-
+
_countinfo; set { _countinfo = value; OnPropertyChanged(); } }
private string _timeinfo;//当前时间
public string Timeinfo { get => _timeinfo; set { _timeinfo = value; OnPropertyChanged(); } }
+
+ private string _infocolor;
+ public string InfoColor { get => _infocolor; set { _infocolor = value; OnPropertyChanged(); } }
private string _epcinfo;//EPC信息
private string _epcasc;//ASC2码 EPC信息
public string EPCinfo { get => _epcinfo; set { _epcinfo = value; OnPropertyChanged(); } }
@@ -1148,6 +1152,12 @@ namespace SocketExample
RSSIinfo = RSSI;
Countinfo = count;
Timeinfo = time;
+ if (infoEPC == "No Read")
+ {
+ InfoColor = "Red";
+ }
+ else
+ InfoColor = "Green";
}
public event PropertyChangedEventHandler PropertyChanged;
@@ -1216,13 +1226,13 @@ namespace SocketExample
if (Buttonflag == 0)
{
this.WindowState = WindowState.Maximized;
- Maxmize_Button.Content = "缩小";
+ MaxMinImage.Source = new BitmapImage(new Uri(@"/取消全屏.png",UriKind.Relative));
Buttonflag = 1;
}
else
{
LoadWindowSettings();
- Maxmize_Button.Content = "最大化";
+ MaxMinImage.Source = new BitmapImage(new Uri(@"/全屏.png", UriKind.Relative));
Buttonflag = 0;
}
}
diff --git a/SocketExample/全屏.png b/SocketExample/全屏.png
new file mode 100644
index 0000000..78807cc
Binary files /dev/null and b/SocketExample/全屏.png differ
diff --git a/SocketExample/关闭.png b/SocketExample/关闭.png
new file mode 100644
index 0000000..c539d2c
Binary files /dev/null and b/SocketExample/关闭.png differ
diff --git a/SocketExample/减号.png b/SocketExample/减号.png
new file mode 100644
index 0000000..fa10ca0
Binary files /dev/null and b/SocketExample/减号.png differ
diff --git a/SocketExample/取消全屏.png b/SocketExample/取消全屏.png
new file mode 100644
index 0000000..9c4a7f4
Binary files /dev/null and b/SocketExample/取消全屏.png differ