修改

MainForm/ClassFile/Inovance_EIP.cs

@@ -149,7 +149,7 @@ namespace EIP_Protocol
         [MarshalAs(UnmanagedType.I2)]       //节拍返回 1：OK   2：NG   
         public short beatReturn;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]   //一个单独的位代表一个报警32*10=320
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]   //一个单独的位代表一个报警32*10=320
         public uint[] fault_codes;
     }
 

MainForm/FaForm/Form_Home.cs

@@ -3401,9 +3401,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
                     {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
+                    {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -3839,9 +3843,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
                     {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
+                    {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -4427,9 +4435,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
                     {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
+                    {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -4874,9 +4886,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
                     {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
+                    {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -5338,9 +5354,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
+                    {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
                     {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -5881,9 +5901,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
                     {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
+                    {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -6486,9 +6510,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
+                    {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
                     {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -6960,9 +6988,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
+                    {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
                     {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }
@@ -7392,9 +7424,13 @@ namespace MainForm
                 byte mesResultFrmWeb = (byte)(result == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 {
-                    mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    if (mesResultFrmWeb == 110)
+                    if (a1Result == 1)
+                    {
+                        mesResultFrmWeb = 1;
+                    }
+                    else
                     {
+                        mesResultFrmWeb = 110;
                         AddMessage(LogType.Info, stationNameStr + "_进站检测结果:FAIL");
                     }
                 }