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
                     {
                     {
@@ -191,7 +183,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             List<string> codeList = new List<string>();
             List<string> codeList = new List<string>();
             //List<CodeInfo> allCodeList = new List<CodeInfo>();
             //List<CodeInfo> allCodeList = new List<CodeInfo>();
-
+         
             try
             try
             {
             {
                 foreach (string cameraName in cameraNameList)
                 foreach (string cameraName in cameraNameList)
@@ -207,39 +199,30 @@ namespace OnlineStore.DeviceLibrary
 
 
                         LogUtil.debug(" 摄像机【" + cameraName + "】获取图片完成");
                         LogUtil.debug(" 摄像机【" + cameraName + "】获取图片完成");
                         System.Threading.Thread.Sleep(1);
                         System.Threading.Thread.Sleep(1);
-                        if (DeCodeType.Equals(1))
+                        HalconDotNet.HObject ho_Image = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
+                        LogUtil.debug(" 摄像机【" + cameraName + "】转换图片完成，开始扫码");
+                        List<CodeInfo> cc = new List<CodeInfo>();
+                        foreach (string codeType in codeTypeList)
                         {
                         {
-                            List<string> result = CodeLibrary.ZXingCodeHelper.DecodeQRCodes(bitmap);
-                            return result;
-                        }
-                        else
-                        {
-                            HalconDotNet.HObject ho_Image = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
-                            LogUtil.debug(" 摄像机【" + cameraName + "】转换图片完成，开始扫码");
-                            List<CodeInfo> cc = new List<CodeInfo>();
-                            foreach (string codeType in codeTypeList)
+                            //判断是否是一维码
+                            if (codeType.ToLower().Equals("barcode"))
                             {
                             {
-                                //判断是否是一维码
-                                if (codeType.ToLower().Equals("barcode"))
-                                {
-                                    cc = HDCodeHelper.DecodeBarCode(ho_Image);
-                                }
-                                else
-                                {
-                                    cc = HDCodeHelper.DecodeCode(ho_Image, 1, GetCodeParamFilePath(codeType), codeType);
-                                }
-                                if (cc.Count > 0)
+                                cc = HDCodeHelper.DecodeBarCode(ho_Image);
+                            }
+                            else
+                            {
+                                cc = HDCodeHelper.DecodeCode(ho_Image, 1, GetCodeParamFilePath(codeType), codeType);
+                            }
+                            if (cc.Count > 0)
+                            {
+                                string r = "";
+                                foreach (CodeInfo c in cc)
                                 {
                                 {
-                                    string r = "";
-                                    foreach (CodeInfo c in cc)
-                                    {
-                                        codeList.Add(c.CodeStr);
-                                        r = r + "##" + c.CodeStr;
-                                    }
-                                    LogUtil.info(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r);
+                                    codeList.Add(c.CodeStr);
+                                    r = r + "##" + c.CodeStr;
                                 }
                                 }
+                                LogUtil.debug(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r);
                             }
                             }
-
                         }
                         }
                     }
                     }
                 }
                 }
@@ -252,7 +235,7 @@ namespace OnlineStore.DeviceLibrary
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 LogUtil.error("扫码出错：" + ex.ToString());
                 LogUtil.error("扫码出错：" + ex.ToString());
-            } 
+            }
             return codeList;
             return codeList;
         }
         }