Browse Source

1、Simulator datagrid keep last log;
2、cancel AdTecMatchMockPMA send message twice;

chenkui 1 year ago
parent
commit
ba5ff5cd67

+ 4 - 4
Venus/Framework/SimulatorCore/Commons/SerialPortDeviceViewModel.cs

@@ -114,8 +114,8 @@ namespace MECF.Framework.Simulator.Core.Commons
                 TransactionLogItems.Add(new TransactionLogItem() { Incoming = obj, OccurTime = DateTime.Now.ToString("HH:mm:ss.fff") });
                 if (TransactionLogItems.Count > maxItemNumber)
                 {
-                    //TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
-                    TransactionLogItems.Clear();
+                    TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
+                    //TransactionLogItems.Clear();
                 }
             }));
         }
@@ -127,8 +127,8 @@ namespace MECF.Framework.Simulator.Core.Commons
                 TransactionLogItems.Add(new TransactionLogItem() { Outgoing = obj, OccurTime = DateTime.Now.ToString("HH:mm:ss.fff") });
                 if (TransactionLogItems.Count > maxItemNumber)
                 {
-                    TransactionLogItems.Clear();
-                    //TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
+                    //TransactionLogItems.Clear();
+                    TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
                 }
             }));
         }

+ 4 - 4
Venus/Framework/SimulatorCore/Commons/SocketDeviceViewModel.cs

@@ -109,8 +109,8 @@ namespace MECF.Framework.Simulator.Core.Commons
             {
                 TransactionLogItems.Add(new TransactionLogItem() { Incoming = obj, OccurTime = DateTime.Now.ToString("HH:mm:ss.fff") });
                 if (TransactionLogItems.Count > maxItemNumber)
-                    //TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
-                    TransactionLogItems.Clear();
+                    TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
+                //TransactionLogItems.Clear();
             }));
         }
 
@@ -120,8 +120,8 @@ namespace MECF.Framework.Simulator.Core.Commons
             {
                 TransactionLogItems.Add(new TransactionLogItem() { Outgoing = obj, OccurTime = DateTime.Now.ToString("HH:mm:ss.fff") });
                 if (TransactionLogItems.Count > maxItemNumber)
-                    //TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
-                    TransactionLogItems.Clear();
+                    TransactionLogItems = new ObservableCollection<TransactionLogItem>(TransactionLogItems.Skip(1).Take(maxItemNumber).ToList());
+                //TransactionLogItems.Clear();
             }));
         }
 

+ 5 - 3
Venus/Venus_Simulator/Devices/AdTecMatchMockPMA.cs

@@ -45,8 +45,10 @@ namespace Venus_Simulator.Devices
                     
                 }
 
-
-                OnWriteMessage(sRes + "\r");
+                if (!string.IsNullOrEmpty(sRes))
+                {
+                    OnWriteMessage(sRes + "\r");
+                }
             }
             //    message = message.TrimEnd('\r');
 
@@ -64,7 +66,7 @@ namespace Venus_Simulator.Devices
             //}
 
             //Thread.Sleep(2 * 1000);
-            OnWriteMessage(sRes + "\r");
+            //OnWriteMessage(sRes + "\r");
         }
     }
 }