1

source/DeviceLibrary/halcon/CodeManager.cs

@@ -132,17 +132,13 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (balserNameList.Contains(cameraName))
                 if (balserNameList.Contains(cameraName))
                 {
                 {
-                    bool result = BaslerCamera.Instance.IsOpen;
-                    if (!result)
-                    {
-                        result = BaslerCamera.Instance.Open(cameraName);
-                        LogUtil.info("打开相机：" + cameraName + "(" + result + ")");
-                    }
+                    bool result = BaslerCamera.Instance.Open(cameraName);
+                    //    LogUtil.info("打开相机：" + cameraName + "(" + result + ")"); 
                     if (result)
                     if (result)
                     {
                     {
                         BaslerCamera.Instance.GrabOne();
                         BaslerCamera.Instance.GrabOne();
                         bitm = BaslerCamera.Instance.Image;
                         bitm = BaslerCamera.Instance.Image;
-                        //BaslerCamera.Instance.Close();
+                        BaslerCamera.Instance.Close();
                     }
                     }
                     else
                     else
                     {
                     {
@@ -151,17 +147,13 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (hikNameList.Contains(cameraName))
                 else if (hikNameList.Contains(cameraName))
                 {
                 {
-                    bool result = HIKCamera.Instance.IsOpen;
-                    if (!result)
-                    {
-                        result = HIKCamera.Instance.Open(cameraName);
-                        LogUtil.info("打开相机：" + cameraName + "(" + result + ")");
-                    }
+                    bool result = HIKCamera.Instance.Open(cameraName);
+                    //    LogUtil.info("打开相机：" + cameraName + "(" + result + ")"); 
                     if (result)
                     if (result)
                     {
                     {
                         HIKCamera.Instance.GrabOne();
                         HIKCamera.Instance.GrabOne();
                         bitm = HIKCamera.Instance.Image;
                         bitm = HIKCamera.Instance.Image;
-                        //HIKCamera.Instance.Close();
+                        HIKCamera.Instance.Close();
                     }
                     }
                     else
                     else
                     {
                     {
@@ -207,13 +199,6 @@ namespace OnlineStore.DeviceLibrary
 
 
                         LogUtil.debug(" 摄像机【" + cameraName + "】获取图片完成");
                         LogUtil.debug(" 摄像机【" + cameraName + "】获取图片完成");
                         System.Threading.Thread.Sleep(1);
                         System.Threading.Thread.Sleep(1);
-                        if (DeCodeType.Equals(1))
-                        {
-                            List<string> result = CodeLibrary.ZXingCodeHelper.DecodeQRCodes(bitmap);
-                            return result;
-                        }
-                        else
-                        {
                         HalconDotNet.HObject ho_Image = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
                         HalconDotNet.HObject ho_Image = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
                         LogUtil.debug(" 摄像机【" + cameraName + "】转换图片完成，开始扫码");
                         LogUtil.debug(" 摄像机【" + cameraName + "】转换图片完成，开始扫码");
                         List<CodeInfo> cc = new List<CodeInfo>();
                         List<CodeInfo> cc = new List<CodeInfo>();
@@ -236,10 +221,8 @@ namespace OnlineStore.DeviceLibrary
                                     codeList.Add(c.CodeStr);
                                     codeList.Add(c.CodeStr);
                                     r = r + "##" + c.CodeStr;
                                     r = r + "##" + c.CodeStr;
                                 }
                                 }
-                                    LogUtil.info(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r);
-                                }
+                                LogUtil.debug(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r);
                             }
                             }
-
                         }
                         }
                     }
                     }
                 }
                 }