1

source/ACPackingStore/FrmStore.cs

@@ -473,6 +473,7 @@ namespace OnlineStore.ACPackingStore
             }
             CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
             frm.ShowDialog();
+            frm.Dispose();
         }
 
 

source/DeviceLibrary/PackingStore/AC_BOX_Bean_Partial.cs

@@ -207,6 +207,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                         timeOutMs = int.MaxValue;
                     }
+                    MoveInfo.TimeOutSeconds=timeOutMs;
                     if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs && NoAlarm())
                     {
                         ConfigIO io = Config.getWaitIO(wait.IoType);

source/DeviceLibrary/device/halcon/CodeManager.cs

@@ -188,14 +188,14 @@ namespace OnlineStore.DeviceLibrary
                         //        }
                         //    } 
                         //}
-                        if (!findRightCode)
-                        {
-                            SaveImageToFile(deviceName, cameraName, bmp);
-                        }
                         if (deviceName != "" || r != "")
                         {
                             LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】[" + findRightCode + "]" + ScanCount + " ：" + r);
                         }
+                        if (!findRightCode)
+                        {
+                            SaveImageToFile(deviceName, cameraName, bmp);
+                        }
                     }
                     catch (AccessViolationException e)
                     {

source/DeviceLibrary/device/halcon/RemoteDecodeHelper.cs

 using CodeLibrary;
 using HalconDotNet;
-using OnlineStore.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -19,15 +18,9 @@ public class RemoteDecodeHelper
 {
     static int webclienttimeout = 30 * 1000;
     static Process p = new Process();
-    private static string serverhost = ConfigAppSettings.GetValue("ScanCodeServer");
+    const string serverhost = "http://127.0.0.1:58137/";
     public static List<CodeInfo> DecodeRequest(HObject hoimg, RemoteDecodeParam remoteDecodeParam)
     {
-
-        if (serverhost.Trim().Equals(""))
-        {
-            serverhost= "http://127.0.0.1:58137/";
-        }
-
         byte[] requestdata;
         lock (hoimg)
         {
@@ -38,10 +31,12 @@ public class RemoteDecodeHelper
                 mStream.Close();
             }
         }
-        return DecodeRequest(requestdata, remoteDecodeParam,true);
+        return DecodeRequest(requestdata, remoteDecodeParam, true);
     }
     public static List<CodeInfo> DecodeRequest(Bitmap bitmap, RemoteDecodeParam remoteDecodeParam)
     {
+        if (bitmap == null)
+            return null;
         byte[] requestdata;
         lock (bitmap)
         {
@@ -55,7 +50,7 @@ public class RemoteDecodeHelper
         }
         return DecodeRequest(requestdata, remoteDecodeParam);
     }
-    static List<CodeInfo> DecodeRequest(byte[] requestdata, RemoteDecodeParam remoteDecodeParam,bool isHObject=false)
+    static List<CodeInfo> DecodeRequest(byte[] requestdata, RemoteDecodeParam remoteDecodeParam, bool isHObject = false)
     {
         CheckAndRunServer();
         string param;
@@ -66,17 +61,18 @@ public class RemoteDecodeHelper
             param = base64UrlEncode(mStreamparam.ToArray());
             mStreamparam.Close();
         }
-        string url = serverhost+"ProcessBitmap?param=";
+        string url = serverhost + "ProcessBitmap?param=";
         if (isHObject)
-            url = serverhost+"Process?param=";
+            url = serverhost + "Process?param=";
         byte[] resp;
         try
         {
             MyWebClient webClient = new MyWebClient(webclienttimeout);
             resp = webClient.UploadData(url + param, requestdata);
+            requestdata = null;
             webClient.Dispose();
         }
-        catch(WebException we)
+        catch (WebException we)
         {
             return null;
         }
@@ -85,13 +81,22 @@ public class RemoteDecodeHelper
             return null;
         }
 
+        List<CodeInfo> codeInfos = null;
         var ss = Encoding.UTF8.GetString(resp).Trim().Trim('"');
-        var bb = Convert.FromBase64String(ss);
-        List<CodeInfo> codeInfos;
-        using (MemoryStream mStreamResult = new MemoryStream(bb))
+        ss = ss.Replace(@"\/", "/");
+        try
+        {
+            var bb = Convert.FromBase64String(ss);
+
+            using (MemoryStream mStreamResult = new MemoryStream(bb))
+            {
+                XmlSerializer xff = new XmlSerializer(typeof(List<CodeInfo>));
+                codeInfos = (List<CodeInfo>)xff.Deserialize(mStreamResult);
+            }
+        }
+        catch
         {
-            XmlSerializer xff = new XmlSerializer(typeof(List<CodeInfo>));
-            codeInfos = (List<CodeInfo>)xff.Deserialize(mStreamResult);
+            throw new Exception(ss);
         }
         return codeInfos;
     }