添加解码超时时间配置

source/AssemblyLineClient/AssemblyLineClient.csproj

@@ -61,6 +61,9 @@
     <Reference Include="CodeLibrary">
     <Reference Include="CodeLibrary">
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="ConfigHelper">
+      <HintPath>..\..\..\..\..\..\SharedRefDll\Neotel\DL.Common\Debug\net462\ConfigHelper.dll</HintPath>
+    </Reference>
     <Reference Include="halcondotnet">
     <Reference Include="halcondotnet">
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
     </Reference>
     </Reference>

source/AssemblyLineClient/FrmAbout.Designer.cs

@@ -59,6 +59,7 @@
             this.lblVersion.TabIndex = 276;
             this.lblVersion.TabIndex = 276;
             this.lblVersion.Text = "版本号：1.1.0000.0000";
             this.lblVersion.Text = "版本号：1.1.0000.0000";
             this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.lblVersion.Click += new System.EventHandler(this.lblVersion_Click);
             // 
             // 
             // lblTime
             // lblTime
             // 
             // 
@@ -94,7 +95,7 @@
             // 
             // 
             // FrmAbout
             // FrmAbout
             // 
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(553, 222);
             this.ClientSize = new System.Drawing.Size(553, 222);
             this.Controls.Add(this.btnCopy);
             this.Controls.Add(this.btnCopy);

source/AssemblyLineClient/FrmAbout.cs

@@ -37,5 +37,10 @@ namespace OnlineStore.AssemblyLine
         {
         {
             Clipboard.SetDataObject(GetCodeNum(), true);
             Clipboard.SetDataObject(GetCodeNum(), true);
         }
         }
+
+        private void lblVersion_Click(object sender, EventArgs e)
+        {
+            ConfigHelper.AdvanceConfigForm.ShowEditDialog(this);
+        }
     }
     }
 }
 }

source/DeviceLibrary/DeviceLibrary.csproj

@@ -47,6 +47,9 @@
       <SpecificVersion>False</SpecificVersion>
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="ConfigHelper">
+      <HintPath>..\..\..\..\..\..\SharedRefDll\Neotel\ConfigHelper\Debug\net461\ConfigHelper.dll</HintPath>
+    </Reference>
     <Reference Include="halcondotnet">
     <Reference Include="halcondotnet">
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
       <HintPath>..\..\dll\halcondotnet.dll</HintPath>
     </Reference>
     </Reference>

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -186,12 +186,12 @@ namespace OnlineStore.DeviceLibrary
                                 {
                                 {
                                     List<CodeInfo> cc = new List<CodeInfo>();
                                     List<CodeInfo> cc = new List<CodeInfo>();
                                     eyemNoCode = true;
                                     eyemNoCode = true;
-
+                                    int timeout = ConfigHelper.Config.Get("Camera_Timeout",8000);
                                     RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
                                     RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
                                     {
                                     {
                                         codeTypeList = allCodeTypeList.ToArray(),
                                         codeTypeList = allCodeTypeList.ToArray(),
                                         codeCount = 3,
                                         codeCount = 3,
-                                        timeout = 3000
+                                        timeout = timeout
                                     };
                                     };
                                     cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
                                     cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
                                     if (cc != null)
                                     if (cc != null)