扫码修改

source/DeviceLibrary/DeviceLibrary/halcon/CodeManager.cs

@@ -120,7 +120,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         BaslerCamera.Instance.GrabOne();
                         BaslerCamera.Instance.GrabOne();
                         bitm = BaslerCamera.Instance.Image;
                         bitm = BaslerCamera.Instance.Image;
-                        //BaslerCamera.Instance.Close();
+                        BaslerCamera.Instance.Close();
                     }
                     }
                     else
                     else
                     {
                     {
@@ -139,7 +139,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         HIKCamera.Instance.GrabOne();
                         HIKCamera.Instance.GrabOne();
                         bitm = HIKCamera.Instance.Image;
                         bitm = HIKCamera.Instance.Image;
-                        //HIKCamera.Instance.Close();
+                        HIKCamera.Instance.Close();
                     }
                     }
                     else
                     else
                     {
                     {
@@ -216,9 +216,12 @@ namespace OnlineStore.DeviceLibrary
                         else
                         else
                         {
                         {
                             List<string> result = CodeLibrary.ZXingCodeHelper.DecodeQRCodes(bitmap);
                             List<string> result = CodeLibrary.ZXingCodeHelper.DecodeQRCodes(bitmap);
-                            return result;
+                            // return result;
+                            codeList.AddRange(result);
                         }
                         }
                     }
                     }
+
+                 //   CloseCamera();
                 }
                 }
             }
             }
             catch (AccessViolationException e)
             catch (AccessViolationException e)