修改IO模块Listen方法

source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOX.cs

@@ -450,6 +450,7 @@ namespace Asa.IOModule
         /// </summary>
         private void Listen()
         {
+            int index = 0;
             while (_loop)
             {
                 Thread.Sleep(10);
@@ -465,7 +466,7 @@ namespace Asa.IOModule
                         byte[] temp = new byte[count];
                         Array.Copy(buff, 0, temp, 0, count);
 
-                        lock (_receive)
+                    //    lock (_receive)
                         {
                             _receive.AddRange(temp);
                             while (_receive.Count > 6)  //分解连包
@@ -475,12 +476,14 @@ namespace Asa.IOModule
                                 byte[] cmd = new byte[len];
                                 _receive.CopyTo(0, cmd, 0, len);
                                 _receive.RemoveRange(0, len);
+                                index++;
                                 log.Debug("Receive: " + HexBuff(cmd));
                                 if (IP.Equals("192.168.101.22") && cmd.Length>7&& (cmd[7] == 2))
                                 {
-                                    LogUtil.LOGGER.Info(LogName + " Listen 收到数据 " + HexBuff(cmd));
+                                    LogUtil.LOGGER.Info(LogName + " Listen 收到数据 ["+index+"] " + HexBuff(cmd));
                                 }
-                                System.Threading.Tasks.Task.Run(() => CommandProcess(cmd));
+                                CommandProcess(cmd, index);
+                           //     System.Threading.Tasks.Task.Run(() => CommandProcess(cmd,  index));
                             }
                         }
                     }
@@ -498,7 +501,7 @@ namespace Asa.IOModule
         /// 接收到的命令处理方法，（task多线程）
         /// </summary>
         /// <param name="cmd"></param>
-        private void CommandProcess(byte[] cmd)
+        private void CommandProcess(byte[] cmd,int index)
         {
             string str;
             int idx = 0;
@@ -509,7 +512,7 @@ namespace Asa.IOModule
                 if (cmd[7] == 1)  //ReadDO
                 {
                     Box_Sta[] staDO = new Box_Sta[_stateDO.Length];
-                    lock (_stateDO)
+                  //  lock (_stateDO)
                     {
                         for (int i = 1; i <= count; i++)
                         {
@@ -518,11 +521,11 @@ namespace Asa.IOModule
                             for (int j = 0; j < 8; j++)  //字节的0-7位
                             {
                                 int n = (val & Convert.ToInt32(Math.Pow(2, move))) >> move;
-                                _stateDO[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
+                                staDO[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
                                 move++;
                             }
                         }
-                        Array.Copy(_stateDO, 0, staDO, 0, staDO.Length);
+                        Array.Copy(staDO, 0, _stateDO, 0, staDO.Length);
                         if (MonitorDO != null)
                         {
                             str = "MonitorDO ";
@@ -536,7 +539,7 @@ namespace Asa.IOModule
                 else if (cmd[7] == 2)  //ReadDI
                 {
                     Box_Sta[] staDI = new Box_Sta[_stateDI.Length];
-                    lock (_stateDI)
+                //    lock (_stateDI)
                     {
                         for (int i = 1; i <= count; i++)
                         {
@@ -545,11 +548,11 @@ namespace Asa.IOModule
                             for (int j = 0; j < 8; j++)  //字节的0-7位
                             {
                                 int n = (val & Convert.ToInt32(Math.Pow(2, move))) >> move;
-                                _stateDI[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
+                                staDI[idx++] = n == 1 ? Box_Sta.On : Box_Sta.Off;
                                 move++;
                             }
                         }
-                        Array.Copy(_stateDI, 0, staDI, 0, staDI.Length);
+                        Array.Copy(staDI, 0, _stateDI, 0, staDI.Length);
                         if (MonitorDI != null)
                         {
                             str = "MonitorDI ";
@@ -567,7 +570,7 @@ namespace Asa.IOModule
                         {
                             msg += " " + (int)s;
                         }
-                        LogUtil.LOGGER.Info(LogName + " DI_Changed_Event  " + msg);
+                        LogUtil.LOGGER.Info(LogName + " DI_Changed_Event ["+index+"]  " + msg);
                     }
                     DI_Changed_Event?.Invoke(this, staDI);
                 }