From adecbb55739eed64c0ce9fd26005d32d182dc0c8 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Wed, 4 Sep 2024 09:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=8B=9F=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=97=B6=EF=BC=8C=E8=89=AF=E7=8E=87100=E6=97=B6?=
 =?UTF-8?q?=E4=BB=8D=E6=9C=89NG=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entitys/SimulateTesterManager.cs          | 40 ++++++++++---------
 Rs.DeweyTester/Entitys/TestFixtureManager.cs  |  2 +-
 Rs.DeweyTester/Program.cs                     |  4 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Rs.DeweyTester/Entitys/SimulateTesterManager.cs b/Rs.DeweyTester/Entitys/SimulateTesterManager.cs
index 8156deb..4254d49 100644
--- a/Rs.DeweyTester/Entitys/SimulateTesterManager.cs
+++ b/Rs.DeweyTester/Entitys/SimulateTesterManager.cs
@@ -59,25 +59,29 @@ namespace Rs.MotionPlat.Entitys
         void CheckTest()
         {
             if (!_btest) return;
-            if(_start.ElapsedMilliseconds>GlobalVar.SimulateTestTime*1000)
+            if (GlobalVar.SimulateTestTime > 0 && GlobalVar.SimulateTestYield > 0)
             {
-                EndTime = DateTime.Now;
-                _start.Stop();
-                _btest = false;
-                testResult = "";
-                int res = 0;
-                if (GlobalVar.SimulateTestYield<100)
+                if (_start.ElapsedMilliseconds > GlobalVar.SimulateTestTime * 1000)
                 {
-                    Random rnd = new Random();
-                    int randomNumber = rnd.Next(0, 100);
-                    res = randomNumber < (100 - GlobalVar.SimulateTestYield) ? 0 : 1;
-                }
-                else
-                {
-                    res = 1;
+                    EndTime = DateTime.Now;
+                    _start.Stop();
+                    _btest = false;
+                    testResult = "";
+                    int res = 0;
+                    if (GlobalVar.SimulateTestYield < 100)
+                    {
+                        Random rnd = new Random();
+                        int randomNumber = rnd.Next(0, 100);
+                        res = randomNumber < (100 - GlobalVar.SimulateTestYield) ? 0 : 1;
+                    }
+                    else
+                    {
+                        res = 1;
+                    }
+                    testResult = $"Result#0#{res}#{SN},{StartTime.ToString("yyyy-MM-dd HH:ss:mm fff")},{EndTime.ToString("yyyy-MM-dd HH:ss:mm fff")}##\r\n#P$";
+                    LogHelper.Debug($">>> {testResult}");
                 }
-                testResult = $"Result#0#{res}#{SN},{StartTime.ToString("yyyy-MM-dd HH:ss:mm fff")},{EndTime.ToString("yyyy-MM-dd HH:ss:mm fff")}##\r\n#P$";
-            }
+            }  
         }
         private void TcpClientHelper_DataRecived(System.Net.Sockets.Socket arg1, byte[] arg2)
         {
@@ -170,8 +174,8 @@ namespace Rs.MotionPlat.Entitys
                             _start.Restart();
                             msg = $"StartTest#1$";
                             tcpClientHelper.Send(msg);
-                            loginfo = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff")} <<< {msg} \r\n";
-                            LogHelper.Debug(loginfo);
+                            //loginfo = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff")} <<< {msg} \r\n";
+                            //LogHelper.Debug(loginfo);
                         }
                         break;
                     case "Result":
diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs
index 6d5fbd8..413ea34 100644
--- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs
+++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs
@@ -634,7 +634,7 @@ namespace Rs.MotionPlat.Entitys
                                     //this.Product.AddResult(this.Index, Result, items[6]);
                                 }
                                 string csvContent = string.Join(",", items[3], items[4], items[5]);
-                                LogHelper.Debug($"Result:{items[3]}");
+                                LogHelper.Debug($"Result:{items[2]},{items[3]}");
                                 DevLog.Summary(CsvTitle, csvContent);
                                 Status = ETestFixtureStatus.IDLE;
                                 dataEvent.Set();
diff --git a/Rs.DeweyTester/Program.cs b/Rs.DeweyTester/Program.cs
index e9bc49b..279144d 100644
--- a/Rs.DeweyTester/Program.cs
+++ b/Rs.DeweyTester/Program.cs
@@ -4,6 +4,7 @@ using Rs.Framework;
 using Rs.MotionPlat.Commom;
 using Rs.MotionPlat.Entitys;
 using Rs.MotionPlat.Flow;
+using Rs.MotionPlat.Flow.SubFlow;
 using Rs.MotionPlat.SysConfig;
 using System;
 using System.Collections.Generic;
@@ -27,7 +28,6 @@ namespace Rs.MotionPlat
         [STAThread]
         static void Main()
         {
-
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             //Application.Run(new FormIO2());
@@ -42,4 +42,6 @@ namespace Rs.MotionPlat
             }
         }
     }
+
+   
 }