代码重构，准备新增客户端统一的系统配置界面

ClientsLibrary/ClientsLibrary.csproj

@@ -62,6 +62,12 @@
     <Compile Include="BasicSupport\FormShowMachineId.Designer.cs">
       <DependentUpon>FormShowMachineId.cs</DependentUpon>
     </Compile>
+    <Compile Include="Configuration\FormConfiguration.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Configuration\FormConfiguration.Designer.cs">
+      <DependentUpon>FormConfiguration.cs</DependentUpon>
+    </Compile>
     <Compile Include="LogsSupport\FormLogView.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -91,6 +97,9 @@
     <EmbeddedResource Include="BasicSupport\FormShowMachineId.resx">
       <DependentUpon>FormShowMachineId.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Configuration\FormConfiguration.resx">
+      <DependentUpon>FormConfiguration.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="LogsSupport\FormLogView.resx">
       <DependentUpon>FormLogView.cs</DependentUpon>
     </EmbeddedResource>

ClientsLibrary/Configuration/FormConfiguration.Designer.cs

@@ -0,0 +1,60 @@
+namespace ClientsLibrary
+{
+    partial class FormConfiguration
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.treeView1 = new System.Windows.Forms.TreeView();
+            this.SuspendLayout();
+            // 
+            // treeView1
+            // 
+            this.treeView1.Location = new System.Drawing.Point(12, 12);
+            this.treeView1.Name = "treeView1";
+            this.treeView1.Size = new System.Drawing.Size(199, 507);
+            this.treeView1.TabIndex = 0;
+            // 
+            // FormConfiguration
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(801, 533);
+            this.Controls.Add(this.treeView1);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormConfiguration";
+            this.Text = "FormConfiguration";
+            this.Load += new System.EventHandler(this.FormConfiguration_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TreeView treeView1;
+    }
+}

ClientsLibrary/Configuration/FormConfiguration.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace ClientsLibrary
+{
+    public partial class FormConfiguration : Form
+    {
+        public FormConfiguration()
+        {
+            InitializeComponent();
+        }
+        
+
+        private void FormConfiguration_Load(object sender, EventArgs e)
+        {
+            Text = "配置系统的参数";
+
+            treeView1.ShowRootLines = false;
+            treeView1.Nodes.Clear();
+
+
+            TreeNode root = new TreeNode("配置系统数据");
+
+            
+
+            treeView1.Nodes.Add(root);
+        }
+        
+    }
+}

ClientsLibrary/Configuration/FormConfiguration.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

CommonLibrary/BasicSupport/SoftSettings.cs

@@ -153,9 +153,9 @@ namespace CommonLibrary
                 { nameof(Announcement), new JValue(Announcement) },
                 { nameof(Can_Account_Login), new JValue(Can_Account_Login) },
                 { nameof(Account_Forbidden_Reason), new JValue(Account_Forbidden_Reason) },
-                { nameof(SystemFactories), new JArray(SystemFactories) },
+                { nameof(SystemFactories), new JValue((new JArray(SystemFactories)).ToString()) },
                 { nameof(WhetherToEnableTrustedClientAuthentication),new JValue(WhetherToEnableTrustedClientAuthentication) },
-                { nameof(TrustedClientList),new JArray(TrustedClientList) }
+                { nameof(TrustedClientList),new JValue((new JArray(TrustedClientList)).ToString()) }
             };
             return json.ToString();
         }

Public/HslCommunication.xml

@@ -2175,6 +2175,19 @@
             <param name="fileSaveName"></param>
             <returns></returns>
         </member>
+        <member name="M:HslCommunication.Enthernet.FileClient.UploadFileAdvanced(System.Net.IPEndPoint,System.String,System.String,System.String,System.String,System.String,System.Action{System.Int64,System.Int64})">
+            <summary>
+            上传文件给文件管理服务器
+            </summary>
+            <param name="iPEndPoint"></param>
+            <param name="fileName">本地完整路径的文件名</param>
+            <param name="serverName">文件名称</param>
+            <param name="factory">工厂大类，第一级大类</param>
+            <param name="group">类别小类，第二级分类</param>
+            <param name="id">标识号类，第三级分类</param>
+            <param name="processReport">汇报进度</param>
+            <returns></returns>
+        </member>
         <member name="M:HslCommunication.Enthernet.FileClient.UploadFile(System.String,System.Int32,System.String,System.String,System.String,System.String,System.Action{System.Int64,System.Int64})">
             <summary>
             上传文件给服务器
@@ -2200,6 +2213,17 @@
             <param name="processReport">汇报进度</param>
             <returns></returns>
         </member>
+        <member name="M:HslCommunication.Enthernet.FileClient.DownloadPathFileNames(System.Net.IPEndPoint,System.String[]@,System.String,System.String,System.String)">
+            <summary>
+            获取指定路径下的所有的文档
+            </summary>
+            <param name="iPEndPoint"></param>
+            <param name="fileNames"></param>
+            <param name="factory"></param>
+            <param name="group"></param>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:HslCommunication.Enthernet.AdvancedFileServer">
             <summary>
             文件传送类服务器，仅仅负责数据传送部分，不负责数据库的存储
@@ -4254,6 +4278,11 @@
             具体的错误代码
             </summary>
         </member>
+        <member name="P:HslCommunication.OperateResult.Tag">
+            <summary>
+            消息附带的额外信息
+            </summary>
+        </member>
         <member name="M:HslCommunication.OperateResult.ToMessageShowString">
             <summary>
             获取错误代号及文本描述