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;