扫码算法更新

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -136,12 +136,12 @@ namespace OnlineStore.DeviceLibrary
                             continue;
                             continue;
                         }
                         }
                         
                         
-                        LogUtil.debug(deviceName + "  【" + cameraName + "】取图片完成，开始扫码");
+                        LogUtil.info(deviceName + "  【" + cameraName + "】取图片完成，开始扫码");
 
 
                         string r = "";
                         string r = "";
-
-                        List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp);
                         bool eyemNoCode = false;
                         bool eyemNoCode = false;
+                        Task eyemtask = Task.Factory.StartNew(delegate{
+                            List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp); 
                             foreach (CodeInfo code in tlci)
                             foreach (CodeInfo code in tlci)
                             {
                             {
                                 LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
                                 LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
@@ -156,6 +156,15 @@ namespace OnlineStore.DeviceLibrary
                                     }
                                     }
                                 }
                                 }
                             }
                             }
+                        });
+                        //最多等待60秒
+                        bool taskResult = eyemtask.Wait(60000);
+                        if (!taskResult)
+                        {
+                            LogUtil.error (deviceName + "  【" + cameraName + "】eyem扫码超时");
+                            eyemNoCode = true;
+                        }
+                       
                         if (!isPreScan)
                         if (!isPreScan)
                         {
                         {
                             if (!findRightCode)
                             if (!findRightCode)
@@ -203,6 +212,11 @@ namespace OnlineStore.DeviceLibrary
                                     nameStr = "eyem";
                                     nameStr = "eyem";
                                 }
                                 }
 
 
+                                if (!taskResult)
+                                {
+                                    nameStr = "eyemTimeOut";
+                                }
+
                                 SaveImageToFile(deviceName, cameraName + nameStr, bmp);
                                 SaveImageToFile(deviceName, cameraName + nameStr, bmp);
                             }
                             }
                         }
                         }