FA开头的二维码，默认为7*32

source/ACSingleStore/FrmStoreBox.cs

@@ -993,14 +993,13 @@ namespace OnlineStore.ACSingleStore
         private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e)
         private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
             store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH); 
             store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH); 
-            string message = "";
-            string outMsg = "";
+            string message = ""; 
             List<string> codeList = CodeManager.CameraScan();
             List<string> codeList = CodeManager.CameraScan();
             foreach (string str in codeList)
             foreach (string str in codeList)
             {
             {
                 message = message + str + "##";
                 message = message + str + "##";
             }
             }
-            LogUtil.info("扫码测试收到二维码【" + outMsg + "】：" + message); 
+            LogUtil.info("扫码测试收到二维码 ：" + message); 
             store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
             store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
         }
         }
 
 

source/ACSingleStore/记录.txt

@@ -73,6 +73,7 @@
    20190505
    20190505
    温湿度功能修改，增加温湿度报警显示。
    温湿度功能修改，增加温湿度报警显示。
 
 
+   FA开头的二维码，默认为7*32
 
 
 
 
 
 

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1487,16 +1487,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 LogUtil.info("上次扫码还未执行完毕,请稍后！");
                 LogUtil.info("上次扫码还未执行完毕,请稍后！");
                 return;
                 return;
-            }
-            //if (scanTimer == null)
-            //{
-            //    scanTimer = new System.Timers.Timer();
-            //    scanTimer.Interval = 10;
-            //    scanTimer.AutoReset = false;
-            //    scanTimer.Enabled = false;
-            //    scanTimer.Elapsed += scanTimer_Elapsed;
-            //}
-            //scanTimer.Enabled = true;
+            } 
             Task.Factory.StartNew(delegate { scanTimer_Elapsed(null, null); });
             Task.Factory.StartNew(delegate { scanTimer_Elapsed(null, null); });
         }
         }
 
 
@@ -1520,7 +1511,14 @@ namespace OnlineStore.DeviceLibrary
             foreach (string str in codeList)
             foreach (string str in codeList)
             {
             {
                 string code = str;
                 string code = str;
-                code = "=1+0x0-7x" + height + "=" + code;
+                if (str.ToUpper().StartsWith("FA"))
+                {
+                    code = "=1+0x0-7x32" + "=" + code;
+                }
+                else
+                {
+                    code = "=1+0x0-7x" + height + "=" + code;
+                }
                 message = message + code + spiltStr;
                 message = message + code + spiltStr;
             }
             }
             if (!outMsg.Equals(""))
             if (!outMsg.Equals(""))

source/DeviceLibrary/halcon/CodeManager.cs

@@ -147,7 +147,7 @@ namespace OnlineStore.DeviceLibrary
         public static List<string> CameraScan()
         public static List<string> CameraScan()
         {
         {
             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
             {
             {
@@ -178,9 +178,17 @@ namespace OnlineStore.DeviceLibrary
                             {
                             {
                                 cc = HDCodeHelper.DecodeCode(ho_Image, 1, GetCodeParamFilePath(codeType), codeType);
                                 cc = HDCodeHelper.DecodeCode(ho_Image, 1, GetCodeParamFilePath(codeType), codeType);
                             }
                             }
-                            //LogUtil.info(" 摄像机【" + cameraName + "】【"+ codeType + "】扫码完成");
-                        }
-                        allCodeList.AddRange(cc);
+                            if (cc.Count > 0)
+                            {
+                                string r = "";
+                                foreach (CodeInfo c in cc)
+                                {
+                                    codeList.Add(c.CodeStr);
+                                    r = r + "##" + c.CodeStr;
+                                }
+                                LogUtil.info(" 【" + cameraName + "】【" + codeType + "】扫码完成："+r);
+                            }
+                        } 
                     }
                     }
                 }
                 }
             }
             }
@@ -192,11 +200,7 @@ namespace OnlineStore.DeviceLibrary
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 LogUtil.error("扫码出错：" + ex.ToString());
                 LogUtil.error("扫码出错：" + ex.ToString());
-            }
-            foreach (CodeInfo info in allCodeList)
-            {
-                codeList.Add(info.CodeStr);
-            }
+            } 
             return codeList;
             return codeList;
         }
         }