新扫码算法更新

dll/model/detect-tiny.cfg

@@ -124,7 +124,7 @@ activation=leaky
 size=1
 stride=1
 pad=1
-filters=21
+filters=18
 activation=linear
 
 
@@ -132,7 +132,7 @@ activation=linear
 [yolo]
 mask = 3,4,5
 anchors = 10,14,  23,27,  37,58,  81,82,  135,169,  344,319
-classes=2
+classes=1
 num=6
 jitter=.3
 ignore_thresh = .7
@@ -168,13 +168,13 @@ activation=leaky
 size=1
 stride=1
 pad=1
-filters=21
+filters=18
 activation=linear
 
 [yolo]
 mask = 0,1,2
 anchors = 10,14,  23,27,  37,58,  81,82,  135,169,  344,319
-classes=2
+classes=1
 num=6
 jitter=.3
 ignore_thresh = .7

source/AssemblyLineClient/model/detect-tiny.cfg

@@ -124,7 +124,7 @@ activation=leaky
 size=1
 stride=1
 pad=1
-filters=21
+filters=18
 activation=linear
 
 
@@ -132,7 +132,7 @@ activation=linear
 [yolo]
 mask = 3,4,5
 anchors = 10,14,  23,27,  37,58,  81,82,  135,169,  344,319
-classes=2
+classes=1
 num=6
 jitter=.3
 ignore_thresh = .7
@@ -168,13 +168,13 @@ activation=leaky
 size=1
 stride=1
 pad=1
-filters=21
+filters=18
 activation=linear
 
 [yolo]
 mask = 0,1,2
 anchors = 10,14,  23,27,  37,58,  81,82,  135,169,  344,319
-classes=2
+classes=1
 num=6
 jitter=.3
 ignore_thresh = .7

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -139,8 +139,9 @@ namespace OnlineStore.DeviceLibrary
 
                         string r = "";
 
-                        List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp);
                         bool eyemNoCode = false;
+                        Task eyemtask = Task.Factory.StartNew(delegate {
+                            List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp);
                             foreach (CodeInfo code in tlci)
                             {
                                 LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
@@ -155,6 +156,14 @@ namespace OnlineStore.DeviceLibrary
                                     }
                                 }
                             }
+                        });
+                        //最多等待60秒
+                        bool taskResult = eyemtask.Wait(60000);
+                        if (!taskResult)
+                        {
+                            LogUtil.error(deviceName + "  【" + cameraName + "】eyem扫码超时");
+                            eyemNoCode = true;
+                        }
                         if (!isPreScan)
                         {
                             if (!findRightCode)