1

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -105,19 +105,19 @@ namespace OnlineStore.DeviceLibrary
         public static List<string> CameraScan(string cameraName, string deviceName, bool findRightCodeBreak = false, int timeOut = 1500)
         public static List<string> CameraScan(string cameraName, string deviceName, bool findRightCodeBreak = false, int timeOut = 1500)
         {
         {
             List<string> nameList = new List<string>() { cameraName };
             List<string> nameList = new List<string>() { cameraName };
-            return CameraScan(nameList, deviceName);
+            return CameraScan(nameList);
         }
         }
         private static int ScanCount = 0;
         private static int ScanCount = 0;
         private static int codeCount = ConfigAppSettings.GetIntValue(Setting_Init.CodeCount);
         private static int codeCount = ConfigAppSettings.GetIntValue(Setting_Init.CodeCount);
         [HandleProcessCorruptedStateExceptions]
         [HandleProcessCorruptedStateExceptions]
-        public static List<CodeInfo> CameraScan(List<string> cameraNameList)
+        public static List<string> CameraScan(List<string> cameraNameList)
         {
         {
-            HashSet<string> codestr = new HashSet<string>();
+            List<string> codestr = new List<string>();
             List<CodeInfo> codeList = new List<CodeInfo>();
             List<CodeInfo> codeList = new List<CodeInfo>();
           //  string bitmapfilename = "";
           //  string bitmapfilename = "";
             if (cameraNameList == null || cameraNameList.Count <= 0)
             if (cameraNameList == null || cameraNameList.Count <= 0)
             {
             {
-                throw new Exception("CameraScan方法没有传入相机名称.");
+                return codestr;
             }
             }
 
 
             try
             try
@@ -236,7 +236,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error(" 扫码出错：" + ex.ToString());
                 LogUtil.error(" 扫码出错：" + ex.ToString());
                 //throw new Exception("扫码出错");
                 //throw new Exception("扫码出错");
             }
             }
-            return codeList;
+            return codestr;
         }
         }
         [HandleProcessCorruptedStateExceptions]
         [HandleProcessCorruptedStateExceptions]
         public static List<string> CameraScan(List<string> cameraList, string deviceName, bool findRightCodeBreak = false, int timeOut = 1500)
         public static List<string> CameraScan(List<string> cameraList, string deviceName, bool findRightCodeBreak = false, int timeOut = 1500)