From 93d0a18c795bc65f7461aef4b40efc5a9cf6fff6 Mon Sep 17 00:00:00 2001
From: zhangxy <zhangxy@mesnac.com>
Date: Mon, 28 Jul 2025 15:31:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E5=8A=9F=E7=8E=87=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=EF=BC=88=E5=B7=B2=E5=A4=87=E4=BB=BD=EF=BC=89=202.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E5=92=8C=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SocketExample/RFIDmonitor.csproj  | 7 +++++++
 SocketExample/TCPWindowV2.xaml    | 2 ++
 SocketExample/TCPWindowV2.xaml.cs | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/SocketExample/RFIDmonitor.csproj b/SocketExample/RFIDmonitor.csproj
index 8aeedf0..75d822c 100644
--- a/SocketExample/RFIDmonitor.csproj
+++ b/SocketExample/RFIDmonitor.csproj
@@ -141,6 +141,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="BackUP\TCPWindowV2-BackUp.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ClientWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -153,6 +157,9 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="BackUP\TCPWindowV2-BackUp.xaml.cs">
+      <DependentUpon>TCPWindowV2-BackUp.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ClientWindow.xaml.cs">
       <DependentUpon>ClientWindow.xaml</DependentUpon>
     </Compile>
diff --git a/SocketExample/TCPWindowV2.xaml b/SocketExample/TCPWindowV2.xaml
index 19fc781..f5426a7 100644
--- a/SocketExample/TCPWindowV2.xaml
+++ b/SocketExample/TCPWindowV2.xaml
@@ -171,6 +171,7 @@
                                         </ItemsControl>
                                     </ScrollViewer>
                                 </Border>
+                                <!-- 功率部分，已备份，注释后不再生成该部分
                                 <Border BorderBrush="Black" BorderThickness="0.5">
                                     <Grid Margin="0 0 0 0">
                                         <Grid.RowDefinitions>
@@ -295,6 +296,7 @@
                                     </Grid>
                                     
                                 </Border>
+                                -->  
                                 <Border BorderBrush="Black" BorderThickness="0.5">
                                     <Grid Margin="0 0 0 2">
                                         <Grid.RowDefinitions>
diff --git a/SocketExample/TCPWindowV2.xaml.cs b/SocketExample/TCPWindowV2.xaml.cs
index ae8dae6..699f35b 100644
--- a/SocketExample/TCPWindowV2.xaml.cs
+++ b/SocketExample/TCPWindowV2.xaml.cs
@@ -264,9 +264,9 @@ namespace SocketExample
                                     startTemp += 16 + TempLength;
                                     string year = DateTime.Now.ToString("yyyy-MM-dd");
                                     EnsureFolderExists($"日志文件夹/{year}/{Text}");
-                                    path = $"日志文件夹/{year}/{Text}/" + path;
+                                    path = $"日志文件夹/{year}/{Text}/" + path + Text + ".txt";
                                     writeToTxt(path, $"EPC:{taglist[j].EPCstring}\nHEX:{EPCinfo}\nRSSI:{taglist[j].RSSI.ToString()}  Count:{taglist[j].Count.ToString()}  Time:{Timeinfo}\n____________________________");
-                                    path = Text + ".txt";
+                                    path = "";
                                     
                                     //LogService.Instance.Debug("");
                                 }