扫码先使用小程序，然后使用本地解码

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -139,68 +139,69 @@ namespace OnlineStore.DeviceLibrary
                         string r = "";
 
                         bool eyemNoCode = false;
-                        //Task eyemtask = Task.Factory.StartNew(delegate
-                        //{
-                        //    List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp);
-                        //    foreach (CodeInfo code in tlci)
-                        //    {
-                        //        LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
-                        //        string str = CodeManager.ReplaceCode(code.CodeStr);
-                        //        if (!codeList.Contains(str))
-                        //        {
-                        //            codeList.Add(str);
-                        //            r = r + "##eyem|" + code.CodeType + "|" + str;
-                        //            if (!findRightCode)
-                        //            {
-                        //                findRightCode = HasRightCode(str);
-                        //            }
-                        //        }
-                        //    }
-                        //});
-                        ////最多等待60秒
-                        //bool taskResult = eyemtask.Wait(60000);
-                        //if (!taskResult)
-                        //{
-                        //    LogUtil.error(deviceName + "  【" + cameraName + "】eyem扫码超时");
-                        //    eyemNoCode = true;
-                        //}
+
                         if (!isPreScan)
                         {
-                            if (!findRightCode)
+                            try
                             {
-                                try
-                                { 
-                                    List<CodeInfo> cc = new List<CodeInfo>();
-                                    eyemNoCode = true;
+                                List<CodeInfo> cc = new List<CodeInfo>();
+                                eyemNoCode = true;
 
-                                    RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
-                                    {
-                                        codeTypeList = allCodeTypeList.ToArray(),
-                                        codeCount = 3,
-                                        timeout = 3000
-                                    };
-                                    cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
-                                    if (cc != null)
+                                RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
+                                {
+                                    codeTypeList = allCodeTypeList.ToArray(),
+                                    codeCount = 3,
+                                    timeout = 3000
+                                };
+                                cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
+                                if (cc != null)
+                                {
+                                    foreach (CodeInfo c in cc)
                                     {
-                                        foreach (CodeInfo c in cc)
+                                        string str = CodeManager.ReplaceCode(c.CodeStr);
+                                        if (!codeList.Contains(str))
                                         {
-                                            string str = CodeManager.ReplaceCode(c.CodeStr);
-                                            if (!codeList.Contains(str))
+                                            codeList.Add(str);
+                                            r = r + "##remote|" + c.CodeType + "|" + str;
+                                            if (!findRightCode)
                                             {
-                                                codeList.Add(str);
-                                                r = r + "##halcon|" + c.CodeType + "|" + str;
-                                                if (!findRightCode)
-                                                {
-                                                    findRightCode = HasRightCode(str);
-                                                }
+                                                findRightCode = HasRightCode(str);
                                             }
                                         }
                                     }
-
                                 }
-                                catch (Exception ex)
+
+                            }
+                            catch (Exception ex)
+                            {
+                                LogUtil.error(deviceName + " RemoteDecodeHelper扫码出错：" + ex.ToString());
+                            }
+                            if (!findRightCode)
+                            {
+                                Task eyemtask = Task.Factory.StartNew(delegate
+                                {
+                                    List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp);
+                                    foreach (CodeInfo code in tlci)
+                                    {
+                                        LogUtil.info(deviceName + "  【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
+                                        string str = CodeManager.ReplaceCode(code.CodeStr);
+                                        if (!codeList.Contains(str))
+                                        {
+                                            codeList.Add(str);
+                                            r = r + "##eyem|" + code.CodeType + "|" + str;
+                                            if (!findRightCode)
+                                            {
+                                                findRightCode = HasRightCode(str);
+                                            }
+                                        }
+                                    }
+                                });
+                                //最多等待60秒
+                                bool taskResult = eyemtask.Wait(60000);
+                                if (!taskResult)
                                 {
-                                    LogUtil.error(deviceName + " RemoteDecodeHelper扫码出错：" + ex.ToString());
+                                    LogUtil.error(deviceName + "  【" + cameraName + "】eyem扫码超时");
+                                    eyemNoCode = true;
                                 }
                             }
                             //if (!findRightCode && SaveErrorImageToFile.Equals(1))