添加 TimeOutEvent 事件

GeneralGommunication/Dev7E.cs

@@ -43,9 +43,9 @@ namespace GeneralGommunication
         /// <summary>
         /// 有数据需要发送
         /// </summary>
-        public event SendDataEventHander SendMsgEvent;
-
+        public event SendDataEventHandler SendMsgEvent;
 
+        public event TimeOutEventHandler TimeOutEvent;
 
 
 
@@ -125,6 +125,8 @@ namespace GeneralGommunication
             {
                 //已经重试了3次，放弃
                 ResetMsg();
+                //连接断开
+                TimeOutEvent?.Invoke(this);
                 return;
             }
             else
@@ -140,25 +142,30 @@ namespace GeneralGommunication
             //IsConnected = true;
             csm.IncRec(recBuf.Count());
 
-            for (int i = 0; i < recBuf.Count(); i++)
+            List<byte[]> packs = new List<byte[]>();
+            lock (currPack)
             {
-                if (recBuf[i] == 0x7e)
+                for (int i = 0; i < recBuf.Count(); i++)
                 {
-                    //找到头了
-                    //结束之前的包
-                    if (currPack.Count > 0)
+                    if (recBuf[i] == 0x7e)
                     {
-                        var pack = currPack.ToArray();
-                        ParsePack(pack);
-                        currPack.Clear();
-                        csm.IncPack(1);
+                        //找到头了
+                        //结束之前的包
+                        if (currPack.Count > 0)
+                        {
+                            var pack = currPack.ToArray();
+                            packs.Add(pack);
+                            currPack.Clear();
+                            csm.IncPack(1);
+                        }
                     }
+                    currPack.Add(recBuf[i]);
                 }
-                currPack.Add(recBuf[i]);
             }
 
-
-            //OnPoll_TimeOut();
+            for (int i = 0; i < packs.Count(); i++) {
+                ParsePack(packs[i]);
+            }
         }
 
 

GeneralGommunication/IDev7E.cs

@@ -28,7 +28,7 @@ namespace GeneralGommunication
         /// <summary>
         /// 有数据需要发送
         /// </summary>
-        event SendDataEventHander SendMsgEvent;
+        event SendDataEventHandler SendMsgEvent;
 
         #region 模块运行接口
 

GeneralGommunication/IModbusAsciiAsync.cs

@@ -21,7 +21,7 @@ namespace GeneralGommunication
         /// <summary>
         /// 有数据需要发送
         /// </summary>
-        event SendDataEventHander SendMsgEvent;
+        event SendDataEventHandler SendMsgEvent;
 
         /// <summary>
         /// 设备连接状态改变

GeneralGommunication/ModbusAsciiAsync.cs

@@ -37,7 +37,7 @@ namespace GeneralGommunication
         /// <summary>
         /// 有数据需要发送
         /// </summary>
-        public event SendDataEventHander SendMsgEvent;
+        public event SendDataEventHandler SendMsgEvent;
 
 
         public event DeviceConnectEventHander DeviceConnectEvent;

GeneralGommunication/ModbusRTUAsync.cs

@@ -36,7 +36,7 @@ namespace GeneralGommunication
         /// <summary>
         /// 有数据需要发送
         /// </summary>
-        public event SendDataEventHander SendMsgEvent;
+        public event SendDataEventHandler SendMsgEvent;
 
         /// <summary>
         /// 对于全部 有返回的函数调用，都使用Dispatcher,使线程同步

GeneralGommunication/Modbus_Transaction.cs

@@ -101,5 +101,8 @@ namespace GeneralGommunication
         public string errMsg;
     }
 
-    public delegate void SendDataEventHander(object sender, byte[] data);
+    public delegate void SendDataEventHandler(object sender, byte[] data);
+
+
+    public delegate void TimeOutEventHandler(object sender);
 }