扫码算法更新

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -135,27 +135,36 @@ namespace OnlineStore.DeviceLibrary
                             CloseCamera(cameraName);
                             CloseCamera(cameraName);
                             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;
-                        foreach (CodeInfo code in tlci)
-                        {
-                            LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
-                            string str = CodeManager.ReplaceCode(code.CodeStr);
-                            if (!codeList.Contains(str))
+                        Task eyemtask = Task.Factory.StartNew(delegate{
+                            List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp); 
+                            foreach (CodeInfo code in tlci)
                             {
                             {
-                                codeList.Add(str);
-                                r = r + "##eyem|" + code.CodeType + "|" + str;
-                                if (!findRightCode)
+                                LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
+                                string str = CodeManager.ReplaceCode(code.CodeStr);
+                                if (!codeList.Contains(str))
                                 {
                                 {
-                                    findRightCode = HasRightCode(str);
+                                    codeList.Add(str);
+                                    r = r + "##eyem|" + code.CodeType + "|" + str;
+                                    if (!findRightCode)
+                                    {
+                                        findRightCode = HasRightCode(str);
+                                    }
                                 }
                                 }
                             }
                             }
+                        });
+                        //最多等待60秒
+                        bool taskResult = eyemtask.Wait(60000);
+                        if (!taskResult)
+                        {
+                            LogUtil.error (deviceName + "  【" + cameraName + "】eyem扫码超时");
+                            eyemNoCode = true;
                         }
                         }
+                       
                         if (!isPreScan)
                         if (!isPreScan)
                         {
                         {
                             if (!findRightCode)
                             if (!findRightCode)
@@ -199,10 +208,15 @@ namespace OnlineStore.DeviceLibrary
                                 //如果halcon没扫出的，
                                 //如果halcon没扫出的，
                                 string nameStr = "";
                                 string nameStr = "";
                                 if (findRightCode && eyemNoCode)
                                 if (findRightCode && eyemNoCode)
-                                {
+                                { 
                                     nameStr = "eyem";
                                     nameStr = "eyem";
                                 }
                                 }
 
 
+                                if (!taskResult)
+                                {
+                                    nameStr = "eyemTimeOut";
+                                }
+
                                 SaveImageToFile(deviceName, cameraName + nameStr, bmp);
                                 SaveImageToFile(deviceName, cameraName + nameStr, bmp);
                             }
                             }
                         }
                         }