From d7b3933f2f9d0d9039f1ca3328d0a1d46d0e2cee Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Thu, 13 Feb 2025 15:56:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B2=BB=E5=85=B7HOME=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=B8=85=E9=99=A4=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=9A=84RESULT=202=E3=80=81=E4=BE=A7=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF=E5=86=99=E5=85=A5EventTrac?=
 =?UTF-8?q?ker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Entitys/TestFixtureManager.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs
index 38cb4f6..961c3e2 100644
--- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs
+++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs
@@ -323,6 +323,12 @@ namespace Rs.MotionPlat.Entitys
 
         public void SetSocket(Socket socket)
         {
+            if(_socket!=null)
+            {
+                _socket.Close();
+                _socket.Dispose();
+                _socket = null;
+            }
             _socket = socket;
         }
 
@@ -406,7 +412,7 @@ namespace Rs.MotionPlat.Entitys
                 }
             }
             Send($"Reset$");
-            Result = "";
+            //Result = "";
             if (CheckPrintLog())
             {
                 AddLog($"<<< TC{Index} Reset$");
@@ -593,6 +599,8 @@ namespace Rs.MotionPlat.Entitys
                                 break;
                             case "3":
                                 //侧相机测试失败
+                                AlarmEntity alarmInfo = AlarmCollection.Get(AlarmConstID.DUT未放好).Transform(Index);
+                                DevLog.EventTracker("ERROR START", alarmInfo.AlarmID, alarmInfo.EN, "WORK");
                                 EButtonType sideCameraSelect = Msgbox.ShowTipDialog(EButtonType.Retry | EButtonType.Cancel, $"Please check DUT{Index} is placed ok，ok continue test click retry，stop test click Cancel","warn",true);
                                 if(sideCameraSelect== EButtonType.Retry)
                                 {
@@ -605,6 +613,7 @@ namespace Rs.MotionPlat.Entitys
                                     Send(msg);
                                 }
                                 dataEvent.Set();
+                                DevLog.EventTracker("ERROR END", alarmInfo.AlarmID, alarmInfo.EN, "WORK");
                                 break;
                         }
                         break;
@@ -982,11 +991,11 @@ namespace Rs.MotionPlat.Entitys
                                         Thread.Sleep(500);
                                         string reg = "Register#1$";
                                         int sendLen = clientSocket.Send(Encoding.ASCII.GetBytes(reg));
-                                        MessageQueue.Instance.Insert($"<<< ip:{ep.Address.ToString()},port:{ep.Port.ToString()},{reg}");
+                                        MessageQueue.Instance.Insert($" >>> ip:{ep.Address.ToString()},port:{ep.Port.ToString()},{reg}");
                                         TestFixture tf = GetTestFixture(int.Parse(items[2]));
                                         tf.SetSocket(soct);
-                                        tf.AddLog(" <<< " + content);
-                                        tf.AddLog(" >>> " + reg);
+                                        tf.AddLog(" >>> " + content);
+                                        tf.AddLog(" <<< " + reg);
                                         tf.MachineID = items[1];
                                         tf.Connected = true;
                                         tf.Status = ETestFixtureStatus.None;