feat(release): 更新HslCommunication库为v5.7.3版本

AndroidTemplate/.idea/codeStyles/Project.xml

@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>

AndroidTemplate/.idea/gradle.xml

@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.3" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

AndroidTemplate/.idea/misc.xml

@@ -5,11 +5,12 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
@@ -24,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

AndroidTemplate/app/build.gradle

@@ -2,6 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
+    sourceSets{
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
     defaultConfig {
         applicationId "com.example.UserSoftwareAndroidTemplate"
         minSdkVersion 19
@@ -16,7 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '27.0.0'
+    buildToolsVersion '27.0.3'
 }
 
 dependencies {
@@ -29,4 +34,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
     implementation 'com.google.code.gson:gson:2.8.2'
+    implementation files('libs/HslCommunication.jar')
 }

AndroidTemplate/app/src/main/java/com/example/HslCommunication/BasicFramework/SoftBasic.java

@@ -1,13 +0,0 @@
-package com.example.HslCommunication.BasicFramework;
-
-/**
- * Created by hsl20 on 2017/11/4.
- * 静态类，提供许多程序运行的方法
- */
-
-public class SoftBasic {
-
-
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/BasicFramework/SystemVersion.java

@@ -1,183 +0,0 @@
-package com.example.HslCommunication.BasicFramework;
-
-/**
- * Created by hsl20 on 2017/11/4.
- */
-
-public class SystemVersion {
-
-    /// <summary>
-    /// 根据格式化字符串的版本号初始化
-    /// </summary>
-    /// <param name="VersionString">格式化的字符串，例如：1.0.0或1.0.0.0503</param>
-    public SystemVersion(String VersionString)
-    {
-        String[] temp = VersionString.split("\\.");
-        if (temp.length >= 3)
-        {
-            m_MainVersion = Integer.parseInt(temp[0]);
-            m_SecondaryVersion = Integer.parseInt(temp[1]);
-            m_EditVersion = Integer.parseInt(temp[2]);
-
-            if (temp.length >= 4)
-            {
-                m_InnerVersion = Integer.parseInt(temp[3]);
-            }
-        }
-    }
-    /// <summary>
-    /// 根据指定的数字实例化一个对象
-    /// </summary>
-    /// <param name="main">主版本</param>
-    /// <param name="sec">次版本</param>
-    /// <param name="edit">修订版</param>
-    public SystemVersion(int main, int sec, int edit)
-    {
-        m_MainVersion = main;
-        m_SecondaryVersion = sec;
-        m_EditVersion = edit;
-    }
-    /// <summary>
-    /// 根据指定的数字实例化一个对象
-    /// </summary>
-    /// <param name="main">主版本</param>
-    /// <param name="sec">次版本</param>
-    /// <param name="edit">修订版</param>
-    /// <param name="inner">内部版本号</param>
-    public SystemVersion(int main, int sec, int edit, int inner)
-    {
-        m_MainVersion = main;
-        m_SecondaryVersion = sec;
-        m_EditVersion = edit;
-        m_InnerVersion = inner;
-    }
-    private int m_MainVersion = 2;
-    /// <summary>
-    /// 主版本
-    /// </summary>
-    public int MainVersion()
-    {
-        return m_MainVersion;
-    }
-    private int m_SecondaryVersion = 0;
-    /// <summary>
-    /// 次版本
-    /// </summary>
-    public int SecondaryVersion() {
-        return m_SecondaryVersion;
-    }
-
-    private int m_EditVersion = 0;
-    /// <summary>
-    /// 修订版
-    /// </summary>
-    public int EditVersion() {
-        return m_EditVersion;
-    }
-    private int m_InnerVersion = 0;
-    /// <summary>
-    /// 内部版本号，或者是版本号表示为年月份+内部版本的表示方式
-    /// </summary>
-    public int InnerVersion()
-    {
-        return m_InnerVersion;
-    }
-
-    /// <summary>
-    /// 根据格式化为支持返回的不同信息的版本号
-    /// C返回1.0.0.0
-    /// N返回1.0.0
-    /// S返回1.0
-    /// </summary>
-    /// <param name="format">格式化信息</param>
-    /// <returns></returns>
-    public String toString(String format)
-    {
-        if(format == "C")
-        {
-            return MainVersion()+"."+SecondaryVersion()+"."+EditVersion()+"."+InnerVersion();
-        }
-
-        if(format == "N")
-        {
-            return MainVersion()+"."+SecondaryVersion()+"."+EditVersion();
-        }
-
-        if(format == "S")
-        {
-            return MainVersion()+"."+SecondaryVersion();
-        }
-
-        return toString();
-    }
-
-
-
-    @Override
-    public String toString() {
-        if(InnerVersion() == 0)
-        {
-            return MainVersion()+"."+SecondaryVersion()+"."+EditVersion();
-        }
-        else
-        {
-            return MainVersion()+"."+SecondaryVersion()+"."+EditVersion()+"."+InnerVersion();
-        }
-    }
-
-
-    public boolean IsSameVersion(SystemVersion sv) {
-        if (this.m_MainVersion != sv.m_MainVersion) {
-            return false;
-        }
-
-        if (this.m_SecondaryVersion != sv.m_SecondaryVersion) {
-            return false;
-        }
-
-        if (this.m_EditVersion != sv.m_EditVersion) {
-            return false;
-        }
-
-        if (this.m_InnerVersion != sv.m_InnerVersion) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public boolean IsSmallerThan(SystemVersion sv) {
-        if (this.m_MainVersion < sv.m_MainVersion) {
-            return true;
-        }
-        else if(this.m_MainVersion > sv.m_MainVersion) {
-            return false;
-        }
-
-        if (this.m_SecondaryVersion < sv.m_SecondaryVersion) {
-            return true;
-        }
-        else if (this.m_SecondaryVersion > sv.m_SecondaryVersion) {
-            return false;
-
-        }
-
-        if (this.m_EditVersion < sv.m_EditVersion) {
-            return true;
-        }
-        else if (this.m_EditVersion > sv.m_EditVersion) {
-            return false;
-        }
-
-        if (this.m_InnerVersion < sv.m_InnerVersion) {
-            return true;
-        }
-        else if (this.m_InnerVersion > sv.m_InnerVersion) {
-            return false;
-        }
-
-        return false;
-    }
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/HslCommunicationCode.java

@@ -1,100 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class HslCommunicationCode {
-
-
-    /// <summary>
-    /// 规定所有的网络传输指令头都为32字节
-    /// </summary>
-    public static final int HeadByteLength = 32;
-
-
-    /// <summary>
-    /// 用于心跳程序的暗号信息
-    /// </summary>
-    public static final int Hsl_Protocol_Check_Secends = 1;
-    /// <summary>
-    /// 客户端退出消息
-    /// </summary>
-    public static final int Hsl_Protocol_Client_Quit = 2;
-    /// <summary>
-    /// 因为客户端达到上限而拒绝登录
-    /// </summary>
-    public static final int Hsl_Protocol_Client_Refuse_Login = 3;
-    /// <summary>
-    /// 允许客户端登录到服务器
-    /// </summary>
-    public static final int Hsl_Protocol_Client_Allow_Login = 4;
-
-
-
-
-    /// <summary>
-    /// 说明发送的只是文本信息
-    /// </summary>
-    public static final int Hsl_Protocol_User_String = 1001;
-    /// <summary>
-    /// 发送的数据就是普通的字节数组
-    /// </summary>
-    public static final int Hsl_Protocol_User_Bytes = 1002;
-    /// <summary>
-    /// 发送的数据就是普通的图片数据
-    /// </summary>
-    public static final int Hsl_Protocol_User_Bitmap = 1003;
-    /// <summary>
-    /// 发送的数据是一条异常的数据，字符串为异常消息
-    /// </summary>
-    public static final int Hsl_Protocol_User_Exception = 1004;
-
-
-
-
-    /// <summary>
-    /// 请求文件下载的暗号
-    /// </summary>
-    public static final int Hsl_Protocol_File_Download = 2001;
-    /// <summary>
-    /// 请求文件上传的暗号
-    /// </summary>
-    public static final int Hsl_Protocol_File_Upload = 2002;
-    /// <summary>
-    /// 请求删除文件的暗号
-    /// </summary>
-    public static final int Hsl_Protocol_File_Delete = 2003;
-    /// <summary>
-    /// 文件校验成功
-    /// </summary>
-    public static final int Hsl_Protocol_File_Check_Right = 2004;
-    /// <summary>
-    /// 文件校验失败
-    /// </summary>
-    public static final int Hsl_Protocol_File_Check_Error = 2005;
-    /// <summary>
-    /// 文件保存失败
-    /// </summary>
-    public static final int Hsl_Protocol_File_Save_Error = 2006;
-    /// <summary>
-    /// 请求文件列表的暗号
-    /// </summary>
-    public static final int Hsl_Protocol_File_Directory_Files = 2007;
-    /// <summary>
-    /// 请求子文件的列表暗号
-    /// </summary>
-    public static final int Hsl_Protocol_File_Directories = 2008;
-
-
-
-
-    /// <summary>
-    /// 不压缩数据字节
-    /// </summary>
-    public static final int Hsl_Protocol_NoZipped = 3001;
-    /// <summary>
-    /// 压缩数据字节
-    /// </summary>
-    public static final int Hsl_Protocol_Zipped  = 3002;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/HslSecurity.java

@@ -1,35 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class HslSecurity {
-
-
-    /// <summary>
-    /// 加密方法，只对当前的程序集开放
-    /// </summary>
-    /// <param name="enBytes">等待加密的数据</param>
-    /// <returns>加密后的数据</returns>
-    public static byte[] ByteEncrypt(byte[] enBytes) {
-        if (enBytes == null) return null;
-        byte[] result = new byte[enBytes.length];
-        for (int i = 0; i < enBytes.length; i++) {
-            result[i] = (byte) (enBytes[i] ^ 0xB5);
-        }
-        return result;
-    }
-
-
-    /// <summary>
-    /// 解密方法，只对当前的程序集开放
-    /// </summary>
-    /// <param name="deBytes">等待解密的数据</param>
-    /// <returns>解密后的数据</returns>
-    public static byte[] ByteDecrypt(byte[] deBytes) {
-        return ByteEncrypt(deBytes);
-    }
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/HslZipped.java

@@ -1,64 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class HslZipped {
-
-
-    /***
-     * 压缩GZip
-     *
-     * @param data
-     * @return
-     */
-    public static byte[] CompressBytes(byte[] data) {
-        byte[] b = null;
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            GZIPOutputStream gzip = new GZIPOutputStream(bos);
-            gzip.write(data);
-            gzip.finish();
-            gzip.close();
-            b = bos.toByteArray();
-            bos.close();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return b;
-    }
-
-    /***
-     * 解压GZip
-     *
-     * @param data
-     * @return
-     */
-    public static byte[] Decompress(byte[] data) {
-        byte[] b = null;
-        try {
-            ByteArrayInputStream bis = new ByteArrayInputStream(data);
-            GZIPInputStream gzip = new GZIPInputStream(bis);
-            byte[] buf = new byte[1024];
-            int num = -1;
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            while ((num = gzip.read(buf, 0, buf.length)) != -1) {
-                baos.write(buf, 0, num);
-            }
-            b = baos.toByteArray();
-            baos.flush();
-            baos.close();
-            gzip.close();
-            bis.close();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return b;
-    }
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/NetBase.java

@@ -1,320 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-import android.util.Log;
-
-import com.example.HslCommunication.Core.Types.HslTimeOut;
-import com.example.HslCommunication.Core.Types.OperateResult;
-import com.example.HslCommunication.Core.Utilities.boolWithBytes;
-import com.example.HslCommunication.Core.Utilities.boolWithSocket;
-import com.example.HslCommunication.Log.LogUtil;
-import com.example.HslCommunication.Resources.StringResources;
-
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.UUID;
-
-
-/**
- * Created by DATHLIN on 2017/11/1.
- * 该类提供基础的网络操作服务，读写字节流，读写文件流
- */
-
-
-
-public abstract class NetBase {
-
-    /// <summary>
-    /// 用于通信工作的核心对象
-    /// </summary>
-    protected Socket WorkSocket = null;
-    /// <summary>
-    /// 分次接收的数据长度
-    /// </summary>
-    public int SegmentationLength = 1024;
-
-    /// <summary>
-    /// 检查超时的子线程
-    /// </summary>
-    /// <param name="obj"></param>
-    public void ThreadPoolCheckConnect(Object obj) {
-        HslTimeOut timeout = (HslTimeOut) obj;
-        if (timeout != null) {
-            NetSupport.ThreadPoolCheckConnect(timeout, ConnectTimeout);
-        }
-    }
-
-
-    /// <summary>
-    /// 网络访问中的超时时间，单位：毫秒，默认值5000
-    /// </summary>
-    public int ConnectTimeout = 5000;
-
-    /// <summary>
-    /// 当前对象的身份令牌，用来在网络通信中双向认证的依据
-    /// </summary>
-    public UUID KeyToken = UUID.randomUUID();
-
-
-    /****************************************************************************
-     *
-     *    1. 创建并连接套接字
-     *    2. 接收指定长度的字节数据
-     *    3. 发送字节数据到套接字
-     *    4. 检查对方是否接收完成
-     *    5. 检查头子节令牌是否通过
-     *    6. 将文件流写入套接字
-     *    7. 从套接字接收文件流
-     *
-     ****************************************************************************/
-
-
-    /// <summary>
-    /// 创建socket对象并尝试连接终结点，如果异常，则结束通信
-    /// </summary>
-    /// <param name="socket">网络套接字</param>
-    /// <param name="iPEndPoint">网络终结点</param>
-    /// <param name="result">结果对象</param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentNullException"></exception>
-    protected boolWithSocket CreateSocketAndConnect(
-            String ipAddress,
-            int port,
-            OperateResult result
-    ) {
-        boolWithSocket value = new boolWithSocket();
-        try {
-            // create the socket object
-            value.Socket = new Socket(ipAddress, port);
-            value.Result = true;
-            return value;
-        } catch (Exception ex) {
-            result.Message = StringResources.ConnectedFailed;
-            LogUtil.LogE("CreateSocketAndConnect", StringResources.ConnectedFailed, ex);
-            CloseSocket(value.Socket);
-            return value;
-        }
-    }
-
-
-    /// <summary>
-    /// 仅仅接收一定长度的字节数据，如果异常，则结束通信
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="bytes">字节数据</param>
-    /// <param name="length">长度</param>
-    /// <param name="result">结果对象</param>
-    /// <param name="receiveStatus">接收状态</param>
-    /// <param name="reportByPercent">是否根据百分比报告进度</param>
-    /// <param name="response">是否回发进度</param>
-    /// <param name="checkTimeOut">是否进行超时检查</param>
-    /// <param name="exceptionMessage">假设发生异常，应该携带什么信息</param>
-    /// <returns></returns>
-    protected boolWithBytes ReceiveBytesFromSocket(
-            Socket socket,
-            int length,
-            OperateResult result,
-            ProgressReport receiveStatus,
-            boolean reportByPercent,
-            boolean response,
-            boolean checkTimeOut,
-            String exceptionMessage
-    ) {
-        boolWithBytes value = new boolWithBytes();
-
-        try {
-            value.Content = NetSupport.ReadBytesFromSocket(socket, length, receiveStatus, reportByPercent, response);
-        } catch (Exception ex) {
-            CloseSocket(socket);
-            result.Message = CombineExceptionString(exceptionMessage, ex.getMessage());
-            LogUtil.LogE("ReceiveBytesFromSocket", exceptionMessage, ex);
-            Log.e("接收数据异常", "ReceiveBytesFromSocket: ", ex);
-            return value;
-        }
-        value.Result = true;
-        return value;
-    }
-
-    /// <summary>
-    /// 仅仅将数据发送到socket对象上去，如果异常，则结束通信
-    /// </summary>
-    /// <param name="socket"></param>
-    /// <param name="send"></param>
-    /// <param name="result"></param>
-    /// <param name="exceptionMessage"></param>
-    /// <returns></returns>
-    protected boolean SendBytesToSocket(
-            Socket socket,
-            byte[] send,
-            OperateResult result,
-            String exceptionMessage
-    ) {
-        try {
-            DataOutputStream output = new DataOutputStream(socket.getOutputStream());
-            output.write(send);
-        } catch (Exception ex) {
-            result.Message = CombineExceptionString(exceptionMessage, ex.getLocalizedMessage());
-            LogUtil.LogE("SendBytesToSocket", exceptionMessage, ex);
-            CloseSocket(socket);
-            send = null;
-            return false;
-        }
-        return true;
-    }
-
-
-    /// <summary>
-    /// 确认对方是否已经接收完成数据，如果异常，则结束通信
-    /// </summary>
-    /// <param name="socket"></param>
-    /// <param name="length"></param>
-    /// <param name="report"></param>
-    /// <param name="result"></param>
-    /// <param name="exceptionMessage"></param>
-    /// <returns></returns>
-    protected boolean CheckRomoteReceived(
-            Socket socket,
-            long length,
-            ProgressReport report,
-            OperateResult result,
-            String exceptionMessage
-    ) {
-        try {
-            NetSupport.CheckSendBytesReceived(socket, length, report, true);
-            return true;
-        } catch (Exception ex) {
-            result.Message = CombineExceptionString(exceptionMessage, ex.getLocalizedMessage());
-            LogUtil.LogE("CheckRomoteReceived", exceptionMessage, ex);
-            CloseSocket(socket);
-            return false;
-        }
-    }
-
-
-    /// <summary>
-    /// 检查令牌是否正确，如果不正确，结束网络通信
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="head">头子令</param>
-    /// <param name="token">令牌</param>
-    /// <param name="result">结果对象</param>
-    /// <returns></returns>
-    protected boolean CheckTokenPermission(
-            Socket socket,
-            byte[] head,
-            UUID token,
-            OperateResult result
-    ) {
-        if (NetSupport.CheckTokenEquel(head, KeyToken)) {
-            return true;
-        } else {
-            result.Message = StringResources.TokenCheckFailed;
-            LogUtil.LogE("CheckTokenPermission", StringResources.TokenCheckFailed + " Ip:" + socket.getInetAddress().toString());
-            CloseSocket(socket);
-            return false;
-        }
-    }
-
-    /// <summary>
-    /// 将文件数据发送至套接字，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket"></param>
-    /// <param name="filename"></param>
-    /// <param name="filelength"></param>
-    /// <param name="result"></param>
-    /// <param name="report"></param>
-    /// <param name="exceptionMessage"></param>
-    /// <returns></returns>
-    protected boolean SendFileStreamToSocket(
-            Socket socket,
-            String filename,
-            long filelength,
-            OperateResult result,
-            ProgressReport report,
-            String exceptionMessage
-    ) {
-        try {
-            InputStream inputStream = new BufferedInputStream(new FileInputStream(filename));
-            NetSupport.WriteSocketFromStream(socket, inputStream, filelength, report, true);
-            inputStream.close();
-            return true;
-        } catch (Exception ex) {
-            CloseSocket(socket);
-            LogUtil.LogE("SendFileStreamToSocket", exceptionMessage, ex);
-            result.Message = CombineExceptionString(exceptionMessage, ex.getLocalizedMessage());
-            return false;
-        }
-    }
-
-
-    /// <summary>
-    /// 从套接字中接收一个文件数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket"></param>
-    /// <param name="filename"></param>
-    /// <param name="receive"></param>
-    /// <param name="report"></param>
-    /// <param name="result"></param>
-    /// <param name="exceptionMessage"></param>
-    /// <returns></returns>
-    protected boolean ReceiveFileSteamFromSocket(
-            Socket socket,
-            String filename,
-            long receive,
-            ProgressReport report,
-            OperateResult result,
-            String exceptionMessage
-    ) {
-        try {
-            OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(filename));
-            NetSupport.WriteStreamFromSocket(socket, outputStream, receive, report, true);
-            outputStream.close();
-            return true;
-        } catch (Exception ex) {
-            result.Message = CombineExceptionString(exceptionMessage, ex.getLocalizedMessage());
-            LogUtil.LogE("ReceiveFileSteamFromSocket", exceptionMessage, ex);
-            CloseSocket(socket);
-            return false;
-        }
-    }
-
-    /// <summary>
-    /// 获取错误的用于显示的信息
-    /// </summary>
-    /// <param name="message"></param>
-    /// <param name="exception"></param>
-    /// <returns></returns>
-    protected String CombineExceptionString(String message, String exception) {
-        return message + "\r\n原因：" + exception;
-    }
-
-
-
-    protected void CloseSocket(Socket socket) {
-        if (socket != null) {
-            try {
-                socket.close();
-            } catch (Exception ex2) {
-                LogUtil.LogE("CloseSocket","",ex2);
-            }
-        }
-    }
-
-
-    protected void ThreadSleep(int milltime)
-    {
-        try
-        {
-            Thread.sleep(milltime);
-        }
-        catch (Exception ex)
-        {
-
-        }
-    }
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/NetShareBase.java

@@ -1,681 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-
-import android.util.Log;
-
-import com.example.HslCommunication.Core.Types.OperateResult;
-import com.example.HslCommunication.Core.Utilities.boolWith2Bytes;
-import com.example.HslCommunication.Core.Utilities.boolWithBytes;
-import com.example.HslCommunication.Core.Utilities.boolWithIntByte;
-import com.example.HslCommunication.Core.Utilities.boolWithIntString;
-import com.example.HslCommunication.Core.Utilities.Utilities;
-import com.example.HslCommunication.Log.LogUtil;
-import com.example.HslCommunication.Resources.StringResources;
-
-
-import java.net.Socket;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public abstract class NetShareBase extends NetBase {
-
-
-    /// <summary>
-    /// [自校验] 发送字节数据并确认对方接收完成数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">网络套接字</param>
-    /// <param name="headcode">头指令</param>
-    /// <param name="customer">用户指令</param>
-    /// <param name="send">发送的数据</param>
-    /// <param name="result">用于返回的结果</param>
-    /// <param name="sendReport">发送的进度报告</param>
-    /// <param name="failedString">失败时存储的额外描述信息</param>
-    /// <returns></returns>
-    protected boolean SendBaseAndCheckReceive(
-            Socket socket,
-            int headcode,
-            int customer,
-            byte[] send,
-            OperateResult result,
-            ProgressReport sendReport,
-            String failedString
-    )
-    {
-        // 数据处理
-        send = NetSupport.CommandBytes(headcode, customer, KeyToken, send);
-
-        Log.i(Utilities.bytes2HexString(send), "SendBaseAndCheckReceive: ");
-
-        // 发送数据
-        if (!SendBytesToSocket(
-                socket,                                                // 套接字
-                send,                                                  // 发送的字节数据
-                result,                                                // 结果信息对象
-                failedString                                           // 异常附加对象
-        ))
-        {
-            send = null;
-            return false;
-        }
-
-        // 确认对方是否接收完成
-        int remoteReceive = send.length - HslCommunicationCode.HeadByteLength;
-        Log.i("等待接收数据", "SendBaseAndCheckReceive: ");
-
-        if (!CheckRomoteReceived(
-                socket,                                                // 套接字
-                remoteReceive,                                         // 对方需要接收的长度
-                sendReport,                                            // 发送进度报告
-                result,                                                // 结果信息对象
-                failedString                                           // 异常附加信息
-        ))
-        {
-            send = null;
-            return false;
-        }
-
-        Log.i("对方接收成功", "SendBaseAndCheckReceive: ");
-        // 对方接收成功
-        send = null;
-        return true;
-    }
-
-    /// <summary>
-    /// [自校验] 发送字节数据并确认对方接收完成数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">网络套接字</param>
-    /// <param name="customer">用户指令</param>
-    /// <param name="send">发送的数据</param>
-    /// <param name="result">用于返回的结果</param>
-    /// <param name="sendReport">发送的进度报告</param>
-    /// <param name="failedString">异常时记录到日志的附加信息</param>
-    /// <returns></returns>
-    protected boolean SendBytesAndCheckReceive(
-            Socket socket,
-            int customer,
-            byte[] send,
-            OperateResult result,
-            ProgressReport sendReport,
-            String failedString
-    )
-    {
-        if (SendBaseAndCheckReceive(
-                socket,                                           // 套接字
-                HslCommunicationCode.Hsl_Protocol_User_Bytes,     // 指示字节数组
-                customer,                                         // 用户数据
-                send,                                             // 发送数据，该数据还要经过处理
-                result,                                           // 结果消息对象
-                sendReport,                                       // 发送的进度报告
-                failedString                                      // 错误的额外描述
-        ))
-        {
-            return true;
-        }
-        else
-        {
-            LogUtil.LogE("SendBytesAndCheckReceive",failedString);
-            return false;
-        }
-    }
-
-    /// <summary>
-    /// [自校验] 直接发送字符串数据并确认对方接收完成数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">网络套接字</param>
-    /// <param name="customer">用户指令</param>
-    /// <param name="send">发送的数据</param>
-    /// <param name="result">用于返回的结果</param>
-    /// <param name="sendReport">发送的进度报告</param>
-    /// <param name="failedString"></param>
-    /// <returns></returns>
-    protected boolean SendStringAndCheckReceive(
-            Socket socket,
-            int customer,
-            String send,
-            OperateResult result,
-            ProgressReport sendReport,
-            String failedString
-    )
-    {
-        byte[] data =null;
-
-        if(send == null ||send.length() <= 0)
-        {
-
-        }
-        else
-        {
-            data = send.getBytes();
-        }
-
-        if (!SendBaseAndCheckReceive(
-                socket,                                           // 套接字
-                HslCommunicationCode.Hsl_Protocol_User_String,    // 指示字符串数据
-                customer,                                         // 用户数据
-                data,                                             // 字符串的数据
-                result,                                           // 结果消息对象
-                sendReport,                                       // 发送的进度报告
-                failedString                                      // 错误的额外描述
-        ))
-        {
-            return false;
-        }
-        return true;
-    }
-
-/*
-    /// <summary>
-    /// [自校验] 将文件数据发送至套接字，具体发送细节将在继承类中实现，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="filename">文件名称，文件必须存在</param>
-    /// <param name="servername">远程端的文件名称</param>
-    /// <param name="filetag">文件的额外标签</param>
-    /// <param name="fileupload">文件的上传人</param>
-    /// <param name="result">操作结果对象</param>
-    /// <param name="sendReport">发送进度报告</param>
-    /// <param name="failedString"></param>
-    /// <returns></returns>
-    protected boolean SendFileAndCheckReceive(
-            Socket socket,
-            String filename,
-            String servername,
-            String filetag,
-            String fileupload,
-            OperateResult result,
-            ProgressReport sendReport,
-            String failedString
-    )
-    {
-        // 发送文件名，大小，标签
-        File info = new File(filename);
-
-        //FileInfo info = new FileInfo(filename);
-
-        if (!info.exists())
-        {
-            // 如果文件不存在
-            if (!SendStringAndCheckReceive(socket, 0, "", result, null, failedString)) return false;
-            else
-            {
-                result.Message = "找不到该文件，请重新确认文件！";
-                CloseSocket(socket);
-                return false;
-            }
-        }
-
-        // 文件存在的情况
-        Newtonsoft.Json.Linq.JObject json = new Newtonsoft.Json.Linq.JObject
-        {
-            { "FileName", new Newtonsoft.Json.Linq.JValue(servername) },
-            { "FileSize", new Newtonsoft.Json.Linq.JValue(info.Length) },
-            { "FileTag", new Newtonsoft.Json.Linq.JValue(filetag) },
-            { "FileUpload", new Newtonsoft.Json.Linq.JValue(fileupload) }
-        };
-
-        if (!SendStringAndCheckReceive(socket, 1, json.ToString(), result, null, failedString)) return false;
-
-
-        if (!SendFileStreamToSocket(socket, filename, info.Length, result, sendReport, failedString))
-        {
-            return false;
-        }
-
-        // 检查接收
-        // if (!CheckRomoteReceived(socket, info.Length, sendReport, result, failedString))
-        // {
-        //    return false;
-        // }
-
-        return true;
-    }
-
-    /// <summary>
-    /// [自校验] 将流数据发送至套接字，具体发送细节将在继承类中实现，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="stream">文件名称，文件必须存在</param>
-    /// <param name="servername">远程端的文件名称</param>
-    /// <param name="filetag">文件的额外标签</param>
-    /// <param name="fileupload">文件的上传人</param>
-    /// <param name="result">操作结果对象</param>
-    /// <param name="sendReport">发送进度报告</param>
-    /// <param name="failedString"></param>
-    /// <returns></returns>
-    protected boolean SendFileAndCheckReceive(
-            Socket socket,
-            Stream stream,
-            String servername,
-            String filetag,
-            String fileupload,
-            OperateResult result,
-            ProgressReport sendReport,
-            String failedString
-    )
-    {
-        // 文件存在的情况
-        Newtonsoft.Json.Linq.JObject json = new Newtonsoft.Json.Linq.JObject
-        {
-            { "FileName", new Newtonsoft.Json.Linq.JValue(servername) },
-            { "FileSize", new Newtonsoft.Json.Linq.JValue(stream.Length) },
-            { "FileTag", new Newtonsoft.Json.Linq.JValue(filetag) },
-            { "FileUpload", new Newtonsoft.Json.Linq.JValue(fileupload) }
-        };
-
-        if (!SendStringAndCheckReceive(socket, 1, json.ToString(), result, null, failedString)) return false;
-
-
-        try
-        {
-            NetSupport.WriteSocketFromStream(socket, stream, stream.Length, sendReport, true);
-        }
-        catch(Exception ex)
-        {
-            CloseSocket(socket);
-            if(LogNet!=null) LogNet.WriteException(failedString, ex);
-            result.Message = CombineExceptionString(failedString, ex.getLocalizedMessage());
-            return false;
-        }
-
-        // 检查接收
-        // if (!CheckRomoteReceived(socket, info.Length, sendReport, result, failedString))
-        // {
-        //    return false;
-        // }
-
-        return true;
-    }*/
-
-
-
-
-    /// <summary>
-    /// [自校验] 接收一条完整的同步数据，包含头子节和内容字节，基础的数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="head">头子节</param>
-    /// <param name="content">内容字节</param>
-    /// <param name="result">结果</param>
-    /// <param name="receiveReport">接收进度反馈</param>
-    /// <param name="failedString">失败时用于显示的字符串</param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentNullException">result</exception>
-    protected boolWith2Bytes ReceiveAndCheckBytes(
-            Socket socket,
-            OperateResult result,
-            ProgressReport receiveReport,
-            String failedString
-    )
-    {
-        boolWith2Bytes value2=new boolWith2Bytes();
-
-        // 30秒超时接收验证
-//        HslTimeOut hslTimeOut = new HslTimeOut()
-//        {
-//            DelayTime = 30000,
-//            IsSuccessful = false,
-//            StartTime = DateTime.Now,
-//            WorkSocket = socket,
-//        };
-//
-//        ThreadPool.QueueUserWorkItem(new WaitCallback(NetSupport.ThreadPoolCheckTimeOut), hslTimeOut);
-
-        Log.i("准备接收头指令", "ReceiveAndCheckBytes: ");
-
-        boolWithBytes value = ReceiveBytesFromSocket(
-                socket,                                             // 套接字
-                HslCommunicationCode.HeadByteLength,                // 头指令长度
-                result,                                             // 结果消息对象
-                null,                                 // 不报告进度
-                false,                             // 报告是否按照百分比报告
-                false,                                    // 不回发接收长度
-                true,                               // 检查是否超时
-                failedString                                       // 异常时的附加文本描述
-        );
-
-        if(!value.Result)
-        {
-            return value2;
-        }
-
-        value2.Content = value.Content;
-
-        Log.i("准备检查令牌", "ReceiveAndCheckBytes: ");
-
-        // 检查令牌
-        if (!CheckTokenPermission(socket, value.Content, KeyToken, result))
-        {
-            Log.i("令牌检查失败", "ReceiveAndCheckBytes: ");
-            result.Message = StringResources.TokenCheckFailed;
-            return value2;
-        }
-
-        // 接收内容
-        byte[] buffer = new byte[4];
-        buffer[0]=value.Content[28];
-        buffer[1]=value.Content[29];
-        buffer[2]=value.Content[30];
-        buffer[3]=value.Content[31];
-        int contentLength = Utilities.bytes2Int(buffer);
-
-        Log.i("准备接收内容，长度为："+contentLength, "ReceiveAndCheckBytes: ");
-
-        value =ReceiveBytesFromSocket(
-                socket,                                     // 套接字
-                contentLength,                              // 内容数据长度
-                result,                                     // 结果消息对象
-                receiveReport,                              // 接收进度报告委托
-                true,                                       // 按照百分比进行报告数据
-                true,                                       // 回发已经接收的数据长度
-                false,                                      // 不进行超时检查
-                failedString                                // 异常时附加的文本描述
-        );
-
-        if(!value.Result)
-        {
-            return value2;
-        }
-        Log.i("内容接收成功", "ReceiveAndCheckBytes: ");
-
-        value2.Content2 = NetSupport.CommandAnalysis(value2.Content, value.Content);
-        value2.Result=true;
-        return value2;
-    }
-
-
-
-    /// <summary>
-    /// [自校验] 从网络中接收一个字符串数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="customer">接收的用户数据</param>
-    /// <param name="receive">接收的字节数据</param>
-    /// <param name="result">结果信息对象</param>
-    /// <param name="receiveReport">接收数据时的进度报告</param>
-    /// <param name="failedString">失败时记录日志的字符串</param>
-    /// <returns></returns>
-    protected boolWithIntString ReceiveStringFromSocket(
-            Socket socket,
-            OperateResult result,
-            ProgressReport receiveReport,
-            String failedString
-    )
-    {
-        boolWithIntString valueString = new boolWithIntString();
-
-        boolWith2Bytes value2Bytes = ReceiveAndCheckBytes(socket,result, receiveReport, failedString);
-
-        if (!value2Bytes.Result)
-        {
-            return valueString;
-        }
-
-        // check
-
-        byte[] buffer = new byte[4];
-        buffer[0]=value2Bytes.Content[0];
-        buffer[1]=value2Bytes.Content[1];
-        buffer[2]=value2Bytes.Content[2];
-        buffer[3]=value2Bytes.Content[3];
-        if (Utilities.bytes2Int(buffer) != HslCommunicationCode.Hsl_Protocol_User_String)
-        {
-            result.Message = "数据头校验失败！";
-            LogUtil.LogE("ReceiveStringFromSocket","数据头校验失败！");
-            CloseSocket(socket);
-            return valueString;
-        }
-
-        buffer[0]=value2Bytes.Content[4];
-        buffer[1]=value2Bytes.Content[5];
-        buffer[2]=value2Bytes.Content[6];
-        buffer[3]=value2Bytes.Content[7];
-        // 分析数据
-        valueString.DataInt = Utilities.bytes2Int(buffer);
-        valueString.DataString = Utilities.byte2String(value2Bytes.Content2);
-        valueString.Result = true;
-        return valueString;
-    }
-
-    /// <summary>
-    /// [自校验] 从网络中接收一串字节数据，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">套接字</param>
-    /// <param name="customer">接收的用户数据</param>
-    /// <param name="data">接收的字节数据</param>
-    /// <param name="result">结果信息对象</param>
-    /// <param name="failedString">失败时记录日志的字符串</param>
-    /// <returns></returns>
-    protected boolWithIntByte ReceiveContentFromSocket(
-            Socket socket,
-            OperateResult result,
-            ProgressReport receiveReport,
-            String failedString
-    )
-    {
-
-        boolWithIntByte value = new boolWithIntByte();
-
-        boolWith2Bytes value2Bytes = ReceiveAndCheckBytes(socket,result,null, failedString);
-
-        if (!value2Bytes.Result)
-        {
-            return value;
-        }
-
-        byte[] buffer = new byte[4];
-        buffer[0]=value2Bytes.Content[0];
-        buffer[1]=value2Bytes.Content[1];
-        buffer[2]=value2Bytes.Content[2];
-        buffer[3]=value2Bytes.Content[3];
-        if (Utilities.bytes2Int(buffer) != HslCommunicationCode.Hsl_Protocol_User_String)
-        {
-            result.Message = "数据头校验失败！";
-            LogUtil.LogE("ReceiveContentFromSocket","数据头校验失败！");
-            CloseSocket(socket);
-            return value;
-        }
-
-        buffer[0]=value2Bytes.Content[4];
-        buffer[1]=value2Bytes.Content[5];
-        buffer[2]=value2Bytes.Content[6];
-        buffer[3]=value2Bytes.Content[7];
-        // 分析数据
-        value.DataInt = Utilities.bytes2Int(buffer);
-        value.Content = value2Bytes.Content2;
-        value.Result = true;
-        return value;
-    }
-
-/*
-
-    /// <summary>
-    /// [自校验] 从套接字中接收文件头信息
-    /// </summary>
-    /// <param name="socket"></param>
-    /// <param name="filename"></param>
-    /// <param name="size"></param>
-    /// <param name="filetag"></param>
-    /// <param name="fileupload"></param>
-    /// <param name="result"></param>
-    /// <param name="failedString"></param>
-    /// <returns></returns>
-    protected bool ReceiveFileHeadFromSocket(
-            Socket socket,
-            out string filename,
-            out long size,
-            out string filetag,
-            out string fileupload,
-            OperateResult result,
-            string failedString = null
-    )
-    {
-        // 先接收文件头信息
-        if (!ReceiveStringFromSocket(socket, out int customer, out string filehead, result, null, failedString))
-        {
-            filename = null;
-            size = 0;
-            filetag = null;
-            fileupload = null;
-            return false;
-        }
-
-        // 判断文件是否存在
-        if (customer == 0)
-        {
-            LogNet?.WriteWarn("对方文件不存在，无法接收！");
-            result.Message = StringResources.FileNotExist;
-            filename = null;
-            size = 0;
-            filetag = null;
-            fileupload = null;
-            socket?.Close();
-            return false;
-        }
-
-        // 提取信息
-        Newtonsoft.Json.Linq.JObject json = Newtonsoft.Json.Linq.JObject.Parse(filehead);
-        filename = SoftBasic.GetValueFromJsonObject(json, "FileName", "");
-        size = SoftBasic.GetValueFromJsonObject(json, "FileSize", 0L);
-        filetag = SoftBasic.GetValueFromJsonObject(json, "FileTag", "");
-        fileupload = SoftBasic.GetValueFromJsonObject(json, "FileUpload", "");
-
-        return true;
-    }
-
-
-    /// <summary>
-    /// [自校验] 从网络中接收一个文件，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">网络套接字</param>
-    /// <param name="savename">接收文件后保存的文件名</param>
-    /// <param name="filename">文件在对方电脑上的文件名</param>
-    /// <param name="size">文件大小</param>
-    /// <param name="filetag">文件的标识</param>
-    /// <param name="fileupload">文件的上传人</param>
-    /// <param name="result">结果信息对象</param>
-    /// <param name="receiveReport">接收进度报告</param>
-    /// <param name="failedString">失败时的记录日志字符串</param>
-    /// <returns></returns>
-    protected bool ReceiveFileFromSocket(
-            Socket socket,
-            string savename,
-            out string filename,
-            out long size,
-            out string filetag,
-            out string fileupload,
-            OperateResult result,
-            Action<long, long> receiveReport,
-            string failedString = null
-    )
-    {
-        // 先接收文件头信息
-        if (!ReceiveFileHeadFromSocket(
-                socket,
-                out filename,
-                out size,
-                out filetag,
-                out fileupload,
-                result,
-                failedString
-        ))
-        {
-            return false;
-        }
-
-        //// 先接收文件头信息
-        //if (!ReceiveStringFromSocket(socket, out int customer, out string filehead, result, null, failedString))
-        //{
-        //    filename = null;
-        //    size = 0;
-        //    filetag = null;
-        //    fileupload = null;
-        //    return false;
-        //}
-
-        //// 判断文件是否存在
-        //if (customer == 0)
-        //{
-        //    LogNet?.WriteWarn("对方文件不存在，无法接收！");
-        //    result.Message = StringResources.FileNotExist;
-        //    filename = null;
-        //    size = 0;
-        //    filetag = null;
-        //    fileupload = null;
-        //    socket?.Close();
-        //    return false;
-        //}
-
-        //// 提取信息
-        //Newtonsoft.Json.Linq.JObject json = Newtonsoft.Json.Linq.JObject.Parse(filehead);
-        //filename = SoftBasic.GetValueFromJsonObject(json, "FileName", "");
-        //size = SoftBasic.GetValueFromJsonObject(json, "FileSize", 0L);
-        //filetag = SoftBasic.GetValueFromJsonObject(json, "FileTag", "");
-        //fileupload = SoftBasic.GetValueFromJsonObject(json, "FileUpload", "");
-
-        // 接收文件消息
-        if (!ReceiveFileSteamFromSocket(socket, savename, size, receiveReport, result, failedString))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// [自校验] 从网络中接收一个文件，写入数据流，如果结果异常，则结束通讯
-    /// </summary>
-    /// <param name="socket">网络套接字</param>
-    /// <param name="stream">等待写入的数据流</param>
-    /// <param name="filename">文件在对方电脑上的文件名</param>
-    /// <param name="size">文件大小</param>
-    /// <param name="filetag">文件的标识</param>
-    /// <param name="fileupload">文件的上传人</param>
-    /// <param name="result">结果信息对象</param>
-    /// <param name="receiveReport">接收进度报告</param>
-    /// <param name="failedString">失败时的记录日志字符串</param>
-    /// <returns></returns>
-    protected bool ReceiveFileFromSocket(
-            Socket socket,
-            Stream stream,
-            out string filename,
-            out long size,
-            out string filetag,
-            out string fileupload,
-            OperateResult result,
-            Action<long, long> receiveReport,
-            string failedString = null
-    )
-    {
-        // 先接收文件头信息
-        if (!ReceiveFileHeadFromSocket(
-                socket,
-                out filename,
-                out size,
-                out filetag,
-                out fileupload,
-                result,
-                failedString
-        ))
-        {
-            return false;
-        }
-
-
-        try
-        {
-            NetSupport.WriteStreamFromSocket(socket, stream, size, receiveReport, true);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            result.Message = ex.Message;
-            socket?.Close();
-            return false;
-        }
-    }
-*/
-
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/NetSupport.java

@@ -1,338 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-
-import com.example.HslCommunication.Core.Types.HslTimeOut;
-import com.example.HslCommunication.Core.Utilities.Utilities;
-
-import java.io.DataOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Date;
-import java.io.DataInputStream;
-import java.util.UUID;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class NetSupport {
-
-    private static final int SocketBufferSize = 4096;
-
-
-
-    public static void ThreadPoolCheckConnect(HslTimeOut timeout, int millisecond) {
-        while (!timeout.IsSuccessful) {
-            if ((new Date().getTime() - timeout.StartTime.getTime()) > millisecond) {
-                // 连接超时或是验证超时
-                if (!timeout.IsSuccessful) {
-                    try {
-                        if (timeout.WorkSocket != null) {
-                            timeout.WorkSocket.close();
-                        }
-                    } catch (java.io.IOException ex) {
-                        // 不处理，放弃
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    public static boolean IsTwoBytesEquel(byte[] b1, int start1, byte[] b2, int start2, int length) {
-        if (b1 == null || b2 == null) return false;
-        for (int i = 0; i < length; i++) {
-            if (b1[i + start1] != b2[i + start2]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static boolean CheckTokenEquel(byte[] head, UUID token)
-    {
-        return IsTwoBytesEquel(head, 12, Utilities.UUID2Byte(token), 0, 16);
-    }
-
-
-
-    public static byte[] ReadBytesFromSocket(Socket socket, int receive, ProgressReport report, boolean reportByPercent, boolean response) throws java.io.IOException
-    {
-        byte[] bytes_receive = new byte[receive];
-        int count_receive = 0;
-        long percent = 0;
-
-        DataInputStream input = new DataInputStream(socket.getInputStream());
-        DataOutputStream output = new DataOutputStream(socket.getOutputStream());
-
-        while (count_receive < receive) {
-            // 分割成4KB来接收数据
-            int receive_length = 0;
-            if ((receive - count_receive) >= SocketBufferSize) {
-                receive_length = SocketBufferSize;
-            } else {
-                receive_length = (receive - count_receive);
-            }
-
-            count_receive += input.read(bytes_receive, count_receive, receive_length);
-
-            if (reportByPercent) {
-                long percentCurrent = (long) count_receive * 100 / receive;
-                if (percent != percentCurrent) {
-                    percent = percentCurrent;
-                    // 报告进度
-                    if (report != null) report.Report(count_receive, receive);
-                }
-            } else {
-                // 报告进度
-                if (report != null) report.Report(count_receive, receive);
-            }
-
-            // 回发进度
-            if (response) output.write(Utilities.long2Bytes((long) count_receive));
-        }
-
-        return bytes_receive;
-    }
-
-
-
-    public static byte[] ReadBytesFromSocket(Socket socket, int receive) throws java.io.IOException {
-        return ReadBytesFromSocket(socket, receive, null, false, false);
-    }
-
-
-
-    /// <summary>
-    /// 读取套接字并且写入流
-    /// </summary>
-    /// <param name="stream">文件流</param>
-    /// <param name="socket">连接的套接字</param>
-    /// <param name="length">返回的文件长度</param>
-    /// <param name="report">发送的进度报告</param>
-    /// <param name="reportByPercent"></param>
-    public static void WriteStreamFromSocket(Socket socket, OutputStream stream, long receive, ProgressReport report, boolean reportByPercent) throws java.io.IOException
-    {
-        byte[] buffer = new byte[SocketBufferSize];
-        long count_receive = 0;
-        long percent = 0;
-
-        DataInputStream input = new DataInputStream(socket.getInputStream());
-        DataOutputStream output = new DataOutputStream(socket.getOutputStream());
-
-        while (count_receive < receive)
-        {
-            // 分割成4KB来接收数据
-            int current = input.read(buffer, 0, SocketBufferSize);
-
-            count_receive += current;
-            stream.write(buffer, 0, current);
-            if (reportByPercent)
-            {
-                long percentCurrent = count_receive * 100 / receive;
-                if (percent != percentCurrent)
-                {
-                    percent = percentCurrent;
-                    // 报告进度
-                    if (report != null) report.Report(count_receive, receive);
-                }
-            }
-            else
-            {
-                // 报告进度
-                if (report != null) report.Report(count_receive, receive);
-            }
-            // 回发进度
-            output.write(Utilities.long2Bytes(count_receive));
-        }
-        buffer = null;
-    }
-
-
-
-
-    /// <summary>
-    /// 读取流并将数据写入socket
-    /// </summary>
-    /// <param name="stream">文件流</param>
-    /// <param name="socket">连接的套接字</param>
-    /// <param name="length">返回的文件长度</param>
-    /// <param name="report">发送的进度报告</param>
-    /// <param name="reportByPercent"></param>
-    public static void WriteSocketFromStream(Socket socket, InputStream stream, long length, ProgressReport report, boolean reportByPercent) throws java.io.IOException
-    {
-        byte[] buffer = new byte[SocketBufferSize];
-        long count_send = 0;
-        long percent = 0;
-
-        DataInputStream input = new DataInputStream(socket.getInputStream());
-        DataOutputStream output = new DataOutputStream(socket.getOutputStream());
-
-        while (count_send < length)
-        {
-            int count = stream.read(buffer, 0, SocketBufferSize);
-            count_send += count;
-
-
-            output.write(buffer, 0, count);
-
-            while (count_send != Utilities.bytes2Long(ReadBytesFromSocket(socket, 8)));
-
-            long received = count_send;
-
-            if (reportByPercent)
-            {
-                long percentCurrent = received * 100 / length;
-                if (percent != percentCurrent)
-                {
-                    percent = percentCurrent;
-                    // 报告进度
-                    if (report != null) report.Report(received, length);
-                }
-            }
-            else
-            {
-                // 报告进度
-                if (report != null) report.Report(received, length);
-            }
-
-            // 双重接收验证
-            if (count == 0)
-            {
-                break;
-            }
-        }
-
-        buffer = null;
-    }
-
-
-
-    public static void CheckSendBytesReceived(Socket socket, long length, ProgressReport report, boolean reportByPercent) throws java.io.IOException
-    {
-        long remoteNeedReceive = 0;
-        long percent = 0;
-
-        // 确认服务器的数据是否接收完成
-        while (remoteNeedReceive < length)
-        {
-            remoteNeedReceive = Utilities.bytes2Long(ReadBytesFromSocket(socket, 8));
-            if (reportByPercent)
-            {
-                long percentCurrent = remoteNeedReceive * 100 / length;
-                if (percent != percentCurrent)
-                {
-                    percent = percentCurrent;
-                    // 报告进度
-                    if (report != null) report.Report(remoteNeedReceive, length);
-                }
-            }
-            else
-            {
-                // 报告进度
-                if (report != null) report.Report(remoteNeedReceive, length);
-            }
-        }
-    }
-
-
-    /*
-
-        发送字节数据的最终命令
-
-     */
-
-    public static byte[] CommandBytes(int customer, UUID token, byte[] data)
-    {
-        return CommandBytes(HslCommunicationCode.Hsl_Protocol_User_Bytes, customer, token, data);
-    }
-
-
-    /*
-
-        生成发送文本数据的最终命令
-
-     */
-
-    public static byte[] CommandBytes(int customer, UUID token, String data)
-    {
-        if (data == null) return CommandBytes(HslCommunicationCode.Hsl_Protocol_User_String, customer, token, null);
-        else return CommandBytes(HslCommunicationCode.Hsl_Protocol_User_String, customer, token, Utilities.string2Byte(data));
-    }
-
-    /*
-
-    生成最终的发送命令
-
-     */
-
-    public static byte[] CommandBytes(int command, int customer, UUID token, byte[] data)
-    {
-        byte[] _temp = null;
-        int _zipped = HslCommunicationCode.Hsl_Protocol_NoZipped;
-        int _sendLength = 0;
-        if (data == null)
-        {
-            _temp = new byte[HslCommunicationCode.HeadByteLength];
-        }
-        else
-        {
-            // 加密
-            data = HslSecurity.ByteEncrypt(data);
-            if (data.length > 10240)
-            {
-                // 10K以上的数据，进行数据压缩
-                data = HslZipped.CompressBytes(data);
-                _zipped = HslCommunicationCode.Hsl_Protocol_Zipped;
-            }
-            _temp = new byte[HslCommunicationCode.HeadByteLength + data.length];
-            _sendLength = data.length;
-        }
-
-        Utilities.int2Bytes(command);
-
-        System.arraycopy(Utilities.int2Bytes(command),0,_temp,0,4);
-        System.arraycopy(Utilities.int2Bytes(customer),0,_temp,4,4);
-        System.arraycopy(Utilities.int2Bytes(_zipped),0,_temp,8,4);
-        System.arraycopy(Utilities.UUID2Byte(token),0,_temp,12,16);
-        System.arraycopy(Utilities.int2Bytes(_sendLength),0,_temp,28,4);
-        if (_sendLength > 0)
-        {
-            System.arraycopy(data,0,_temp,32,_sendLength);
-        }
-        return _temp;
-    }
-
-
-    /*
-
-    从接收的数据命令开始解析
-
-     */
-
-    public static byte[] CommandAnalysis(byte[] head, byte[] content)
-    {
-        if (content != null)
-        {
-            byte[] buffer = new byte[4];
-            buffer[0] = head[8];
-            buffer[1] = head[9];
-            buffer[2] = head[10];
-            buffer[3] = head[11];
-
-            int _zipped = Utilities.bytes2Int(buffer);
-            // 先进行解压
-            if (_zipped == HslCommunicationCode.Hsl_Protocol_Zipped)
-            {
-                content = HslZipped.Decompress(content);
-            }
-            // 进行解密
-            return HslSecurity.ByteDecrypt(content);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Net/ProgressReport.java

@@ -1,16 +0,0 @@
-package com.example.HslCommunication.Core.Net;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-
-public abstract class ProgressReport {
-
-
-    public void Report(long current,long totle)
-    {
-
-    }
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Types/HslTimeOut.java

@@ -1,26 +0,0 @@
-package com.example.HslCommunication.Core.Types;
-
-import java.net.Socket;
-import java.util.Date;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class HslTimeOut {
-
-
-    public HslTimeOut()
-    {
-        StartTime = new Date();
-        IsSuccessful = false;
-    }
-
-    public Date StartTime=null;
-
-    public boolean IsSuccessful=false;
-
-    public int DelayTime=5000;
-
-    public Socket WorkSocket=null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Types/NetHandle.java

@@ -1,109 +0,0 @@
-package com.example.HslCommunication.Core.Types;
-
-import com.example.HslCommunication.Core.Utilities.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public final class NetHandle {
-
-
-    /// <summary>
-    /// 初始化一个暗号对象
-    /// </summary>
-    public NetHandle(int value)
-    {
-        byte[] buffer = Utilities.int2Bytes(value);
-
-        m_CodeMajor = buffer[3];
-        m_CodeMinor = buffer[2];
-        m_CodeIdentifier = Utilities.byte2Short(buffer,0);
-
-
-        m_CodeValue = value;
-    }
-
-
-    /// <summary>
-    /// 根据三个值来初始化暗号对象
-    /// </summary>
-    /// <param name="major">主暗号</param>
-    /// <param name="minor">次暗号</param>
-    /// <param name="identifier">暗号编号</param>
-    public NetHandle(int major, int minor, int identifier)
-    {
-        m_CodeValue = 0;
-
-        byte[] buffer_major=Utilities.int2Bytes(major);
-        byte[] buffer_minor=Utilities.int2Bytes(minor);
-        byte[] buffer_identifier=Utilities.int2Bytes(identifier);
-
-        m_CodeMajor = buffer_major[0];
-        m_CodeMinor = buffer_minor[0];
-        m_CodeIdentifier = Utilities.byte2Short(buffer_identifier,0);
-
-        byte[] buffer = new byte[4];
-        buffer[3] = m_CodeMajor;
-        buffer[2] = m_CodeMinor;
-        buffer[1] = buffer_identifier[1];
-        buffer[0] = buffer_identifier[0];
-
-        m_CodeValue = Utilities.bytes2Int(buffer);
-    }
-
-
-    /// <summary>
-    /// 完整的暗号值
-    /// </summary>
-    private int m_CodeValue;
-
-    /// <summary>
-    /// 主暗号分类0-255
-    /// </summary>
-    private byte m_CodeMajor;
-
-    /// <summary>
-    /// 次要的暗号分类0-255
-    /// </summary>
-    private byte m_CodeMinor;
-
-    /// <summary>
-    /// 暗号的编号分类0-65535
-    /// </summary>
-    private short m_CodeIdentifier;
-
-
-
-    /// <summary>
-    /// 完整的暗号值
-    /// </summary>
-    public int get_CodeValue(){
-        return  m_CodeValue;
-    }
-
-    /// <summary>
-    /// 主暗号分类0-255
-    /// </summary>
-    public byte get_CodeMajor() {
-        return m_CodeMajor;
-    }
-
-    /// <summary>
-    /// 次要的暗号分类0-255
-    /// </summary>
-    public byte get_CodeMinor() {
-        return m_CodeMinor;
-    }
-
-    /// <summary>
-    /// 暗号的编号分类0-65535
-    /// </summary>
-    public short get_CodeIdentifier() {
-        return m_CodeIdentifier;
-    }
-
-
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Types/OperateResult.java

@@ -1,38 +0,0 @@
-package com.example.HslCommunication.Core.Types;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class OperateResult {
-
-    /// <summary>
-    /// 指示本次访问是否成功
-    /// </summary>
-    public boolean IsSuccess =false;
-
-
-    /// <summary>
-    /// 具体的错误描述
-    /// </summary>
-    public String Message  = "Unknown Errors";
-    /// <summary>
-    /// 具体的错误代码
-    /// </summary>
-    public int ErrorCode = 10000;
-
-    /// <summary>
-    /// 消息附带的额外信息
-    /// </summary>
-    public Object Tag =null;
-
-    /// <summary>
-    /// 获取错误代号及文本描述
-    /// </summary>
-    /// <returns></returns>
-    public String ToMessageShowString()
-    {
-        return "错误代码："+ErrorCode +"\r\n错误信息："+Message;
-    }
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Types/OperateResultBytes.java

@@ -1,9 +0,0 @@
-package com.example.HslCommunication.Core.Types;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-public class OperateResultBytes extends OperateResult {
-    public byte[] Content =null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Types/OperateResultString.java

@@ -1,11 +0,0 @@
-package com.example.HslCommunication.Core.Types;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-
-
-public class OperateResultString extends OperateResult {
-    public String Content = null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/Utilities.java

@@ -1,175 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-import com.example.HslCommunication.Log.LogUtil;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-/**
- * Created by DATHLIN on 2017/11/1.
- */
-
-
-
-public class Utilities {
-
-    public static byte[] int2Bytes(int num) {
-        byte[] byteNum = new byte[4];
-        for (int ix = 0; ix < 4; ++ix) {
-            int offset = 32 - (ix + 1) * 8;
-            byteNum[3-ix] = (byte) ((num >> offset) & 0xff);
-        }
-        return byteNum;
-    }
-
-    public static int bytes2Int(byte[] byteNum) {
-        int num = 0;
-        for (int ix = 0; ix < 4; ++ix) {
-            num <<= 8;
-            num |= (byteNum[3-ix] & 0xff);
-        }
-        return num;
-    }
-
-    public static byte int2OneByte(int num) {
-        return (byte) (num & 0x000000ff);
-    }
-
-    public static int oneByte2Int(byte byteNum) {
-        //针对正数的int
-        return byteNum > 0 ? byteNum : (128 + (128 + byteNum));
-    }
-
-    public static byte[] long2Bytes(long num) {
-        byte[] byteNum = new byte[8];
-        for (int ix = 0; ix < 8; ++ix) {
-            int offset = 64 - (ix + 1) * 8;
-            byteNum[7-ix] = (byte) ((num >> offset) & 0xff);
-        }
-        return byteNum;
-    }
-
-    public static long bytes2Long(byte[] byteNum) {
-        long num = 0;
-        for (int ix = 0; ix < 8; ++ix) {
-            num <<= 8;
-            num |= (byteNum[7-ix] & 0xff);
-        }
-        return num;
-    }
-
-    public static UUID Byte2UUID(byte[] data) {
-        if (data.length != 16) {
-            throw new IllegalArgumentException("Invalid UUID byte[]");
-        }
-        long msb = 0;
-        long lsb = 0;
-        for (int i = 0; i < 8; i++)
-            msb = (msb << 8) | (data[i] & 0xff);
-        for (int i = 8; i < 16; i++)
-            lsb = (lsb << 8) | (data[i] & 0xff);
-
-        return new UUID(msb, lsb);
-    }
-
-    public static byte[] UUID2Byte(UUID uuid) {
-        ByteArrayOutputStream ba = new ByteArrayOutputStream(16);
-        DataOutputStream da = new DataOutputStream(ba);
-        try {
-            da.writeLong(uuid.getMostSignificantBits());
-            da.writeLong(uuid.getLeastSignificantBits());
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
-        byte[] buffer = ba.toByteArray();
-        // 进行错位
-        byte temp=buffer[0];
-        buffer[0] = buffer[3];
-        buffer[3] =temp;
-        temp=buffer[1];
-        buffer[1]=buffer[2];
-        buffer[2]=temp;
-
-        temp = buffer[4];
-        buffer[4]=buffer[5];
-        buffer[5] =temp;
-
-        temp = buffer[6];
-        buffer[6]=buffer[7];
-        buffer[7] =temp;
-
-        return buffer;
-    }
-
-    public static short byte2Short(byte[] b, int index) {
-        return (short) (((b[index + 0] << 8) | b[index + 1] & 0xff));
-    }
-
-
-    public static byte[] short2Byte(short s) {
-        byte[] targets = new byte[2];
-        for (int i = 0; i < 2; i++) {
-            int offset = (targets.length - 1 - i) * 8;
-            targets[1-i] = (byte) ((s >>> offset) & 0xff);
-        }
-        return targets;
-    }
-
-    public static byte[] string2Byte(String str) {
-        if (str == null) {
-            return null;
-        }
-        byte[] byteArray;
-        try {
-            byteArray = str.getBytes("unicode");
-        } catch (Exception ex) {
-            byteArray = str.getBytes();
-            LogUtil.LogE("string2Byte","unicode编码转换错误",ex);
-        }
-//
-//        for(int i=0;i<byteArray.length;i++)
-//        {
-//            byte temp=byteArray[i];
-//            byteArray[i]=byteArray[i+1];
-//            byteArray[i+1] =temp;
-//            i++;
-//        }
-        return byteArray;
-    }
-
-    public static String byte2String(byte[] byteArray) {
-        if (byteArray == null) {
-            return null;
-        }
-
-        for (int i = 0; i < byteArray.length; i++) {
-            byte temp = byteArray[i];
-            byteArray[i] = byteArray[i + 1];
-            byteArray[i + 1] = temp;
-            i++;
-        }
-        String str;
-        try {
-            str = new String(byteArray, "unicode");
-        } catch (Exception ex) {
-            str = new String(byteArray);
-        }
-        return str;
-    }
-
-    private static final char[] HEX_CHAR = {'0', '1', '2', '3', '4', '5',
-            '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    public static String bytes2HexString(byte[] bytes) {
-        char[] buf = new char[bytes.length * 2];
-        int index = 0;
-        for(byte b : bytes) { // 利用位运算进行转换，可以看作方法一的变种
-            buf[index++] = HEX_CHAR[b >>> 4 & 0xf];
-            buf[index++] = HEX_CHAR[b & 0xf];
-        }
-
-        return new String(buf);
-    }
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWith2Bytes.java

@@ -1,9 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public class boolWith2Bytes extends boolWithBytes {
-    public byte[] Content2=null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithBytes.java

@@ -1,14 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-
-public class boolWithBytes extends boolWithNone {
-
-
-    public byte[] Content=null;
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithIntByte.java

@@ -1,9 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public class boolWithIntByte extends boolWithBytes {
-    public int DataInt=0;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithIntString.java

@@ -1,14 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public class boolWithIntString extends boolWithNone {
-
-
-    public int DataInt=0;
-
-
-    public String DataString=null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithNone.java

@@ -1,23 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/3.
- */
-
-
-
-
-/*
-*
-* 结果类的基础，提供一个boolen
-*
-*
-* */
-
-public class boolWithNone {
-
-    /*
-        返回真还是否
-     */
-    public boolean Result = false;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithSiemens.java

@@ -1,16 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/3.
- */
-
-public class boolWithSiemens extends boolWithNone {
-
-
-    public byte type=0;
-
-    public int startAddress=0;
-
-    public short dbAddress=0;
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithSocket.java

@@ -1,11 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-import java.net.Socket;
-
-/**
- * Created by hsl20 on 2017/11/4.
- */
-
-public class boolWithSocket extends boolWithNone {
-    public Socket Socket=null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Core/Utilities/boolWithString.java

@@ -1,10 +0,0 @@
-package com.example.HslCommunication.Core.Utilities;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public class boolWithString extends boolWithNone {
-
-    public String Content=null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Enthernet/AsyncStateOne.java

@@ -1,135 +0,0 @@
-package com.example.HslCommunication.Enthernet;
-
-import com.example.HslCommunication.Core.Net.HslCommunicationCode;
-
-import java.net.Socket;
-import java.util.Date;
-import java.util.UUID;
-
-/**
- * Created by hsl20 on 2017/11/4.
- */
-
-public class AsyncStateOne {
-
-
-    /// <summary>
-    /// 实例化一个对象
-    /// </summary>
-    public AsyncStateOne() {
-        ClientUniqueID = UUID.randomUUID().toString();
-    }
-
-    /// <summary>
-    /// IP地址
-    /// </summary>
-    private String IpAddress = "";
-
-    public String getIpAddress() {
-        return IpAddress;
-    }
-
-    private void setIpAddress(String ipAddress) {
-        IpAddress = ipAddress;
-    }
-
-
-    /*
-        端口号
-     */
-    private int IpPort = 10000;
-
-    public int getIpPort() {
-        return IpPort;
-    }
-
-    private void setIpPort(int ipPort) {
-        IpPort = ipPort;
-    }
-
-
-    /*
-        登录的别名
-     */
-    private String LoginAlias = "";
-
-    public String getLoginAlias() {
-        return LoginAlias;
-    }
-
-    public void setLoginAlias(String loginAlias) {
-        LoginAlias = loginAlias;
-    }
-
-
-    /*
-        心跳验证的时间点
-     */
-    private Date HeartTime=new Date();
-    public Date getHeartTime() {
-        return HeartTime;
-    }
-
-    public void setHeartTime(Date heartTime) {
-        HeartTime = heartTime;
-    }
-
-
-    /*
-        客户端类别
-     */
-    private String ClientType="";
-    public void setClientType(String clientType) {
-        ClientType = clientType;
-    }
-
-
-    public String getClientType() {
-        return ClientType;
-    }
-
-
-    /*
-        客户端的唯一标识
-     */
-    private String ClientUniqueID="";
-    public String getClientUniqueID() {
-        return ClientUniqueID;
-    }
-
-    public void setClientUniqueID(String clientUniqueID) {
-        ClientUniqueID = clientUniqueID;
-    }
-
-
-
-    /// <summary>
-    /// 指令头缓存
-    /// </summary>
-    byte[] BytesHead = new byte[HslCommunicationCode.HeadByteLength];
-    /// <summary>
-    /// 已经接收的指令头长度
-    /// </summary>
-    int AlreadyReceivedHead = 0;
-    /// <summary>
-    /// 数据内容缓存
-    /// </summary>
-    byte[] BytesContent = null;
-    /// <summary>
-    /// 已经接收的数据内容长度
-    /// </summary>
-    int AlreadyReceivedContent = 0;
-
-    /// <summary>
-    /// 清除本次的接收内容
-    /// </summary>
-    void Clear() {
-        BytesHead = new byte[HslCommunicationCode.HeadByteLength];
-        AlreadyReceivedHead = 0;
-        BytesContent = null;
-        AlreadyReceivedContent = 0;
-    }
-
-
-    Socket WorkSocket=null;
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Enthernet/NetComplexClient.java

@@ -1,442 +0,0 @@
-package com.example.HslCommunication.Enthernet;
-
-import com.example.HslCommunication.Core.Net.HslCommunicationCode;
-import com.example.HslCommunication.Core.Net.NetShareBase;
-import com.example.HslCommunication.Core.Net.NetSupport;
-import com.example.HslCommunication.Core.Types.NetHandle;
-import com.example.HslCommunication.Core.Types.OperateResult;
-import com.example.HslCommunication.Core.Utilities.Utilities;
-import com.example.HslCommunication.Core.Utilities.boolWith2Bytes;
-import com.example.HslCommunication.Core.Utilities.boolWithSocket;
-import com.example.HslCommunication.Log.LogUtil;
-import com.example.HslCommunication.Resources.StringResources;
-
-import java.net.Socket;
-import java.util.Date;
-
-/**
- * Created by hsl20 on 2017/11/4.
- */
-
-public class NetComplexClient extends NetShareBase {
-
-
-
-    /// <summary>
-    /// 客户端的核心连接块
-    /// </summary>
-    private AsyncStateOne stateone = new AsyncStateOne();
-    /// <summary>
-    /// 客户端系统是否启动
-    /// </summary>
-    public boolean Is_Client_Start = false;
-
-    /// <summary>
-    /// 重连接失败的次数
-    /// </summary>
-    public int Connect_Failed_Count  = 0;
-    /// <summary>
-    /// 指示客户端是否处于正在连接服务器中
-    /// </summary>
-    private boolean Is_Client_Connecting = false;
-    /// <summary>
-    /// 登录服务器的判断锁
-    /// </summary>
-    private Object lock_connecting = new Object();
-    /// <summary>
-    /// 客户端登录的标识名称，可以为ID号，也可以为登录名
-    /// </summary>
-    public String ClientAlias = "";
-    /// <summary>
-    /// 远程服务器的IP地址和端口
-    /// </summary>
-    public String ServerIp = "127.0.0.1";
-    /*
-        远程服务器的端口
-     */
-    public int ServerPort = 10000;
-
-    /// <summary>
-    /// 服务器的时间，自动实现和服务器同步
-    /// </summary>
-    private Date ServerTime  = new Date();
-    /// <summary>
-    /// 系统与服务器的延时时间，单位毫秒
-    /// </summary>
-    private int DelayTime =0;
-
-
-
-    public void LoginSuccess()
-    {
-
-    }
-
-    public  void LoginFailed(int times)
-    {
-
-    }
-
-    public void MessageAlerts(String msg)
-    {
-
-    }
-
-    public void BeforReConnected()
-    {
-
-    }
-
-    public void AcceptString(NetHandle handle, String msg)
-    {
-
-    }
-
-    public void AcceptByte( NetHandle handle, byte[] msg)
-    {
-
-    }
-
-
-    private boolean IsQuie = false;
-
-    /// <summary>
-    /// 关闭该客户端引擎
-    /// </summary>
-    public void ClientClose() {
-        IsQuie = true;
-        if (Is_Client_Start)
-            SendBytes(stateone, NetSupport.CommandBytes(HslCommunicationCode.Hsl_Protocol_Client_Quit, 0, KeyToken, null));
-
-        if (thread_heart_check != null) thread_heart_check.interrupt();
-        Is_Client_Start = false;
-
-
-        ThreadSleep(10);
-
-        CloseSocket(stateone.WorkSocket);
-        LogUtil.LogD("ClientClose","Client Close.");
-    }
-    /// <summary>
-    /// 启动客户端引擎，连接服务器系统
-    /// </summary>
-    public void ClientStart()
-    {
-        if (Is_Client_Start) return;
-        Thread thread_login = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                ThreadLogin();
-            }
-        });
-        thread_login.start();
-        LogUtil.LogD("ClientStart","Client Start.");
-
-        if (thread_heart_check == null)
-        {
-            thread_heart_check = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    ThreadHeartCheck();
-                }
-            });
-            thread_heart_check.start();
-        }
-    }
-    private void ThreadLogin()
-    {
-        synchronized (lock_connecting)
-        {
-            if (Is_Client_Connecting) return;
-            Is_Client_Connecting = true;
-        }
-
-
-        if (Connect_Failed_Count == 0)
-        {
-            MessageAlerts("正在连接服务器...");
-        }
-        else
-        {
-            int count = 10;
-            while (count > 0)
-            {
-                if (IsQuie) return;
-                MessageAlerts("连接断开，等待" + count-- + "秒后重新连接");
-                ThreadSleep(1000);
-            }
-            MessageAlerts("正在尝试第" + Connect_Failed_Count + "次连接服务器...");
-        }
-
-
-        stateone.setHeartTime(new Date());
-        LogUtil.LogD("ThreadLogin","Begin Connect Server, Times: " + Connect_Failed_Count);
-
-
-        OperateResult result = new OperateResult();
-
-        Socket socket=null;
-        boolWithSocket valueSocket = CreateSocketAndConnect(ServerIp,ServerPort,result);
-        if(!valueSocket.Result)
-        {
-            Connect_Failed_Count++;
-            Is_Client_Connecting = false;
-            LoginFailed(Connect_Failed_Count);
-            LogUtil.LogW("ThreadLogin","Connected Failed, Times: " + Connect_Failed_Count);
-            // 连接失败，重新连接服务器
-            ReconnectServer();
-            return;
-        }
-
-        socket = valueSocket.Socket;
-
-        // 连接成功，发送数据信息
-        if(!SendStringAndCheckReceive(
-                socket,
-                2,
-                ClientAlias,
-                result,
-                null,
-                null
-        ))
-        {
-            Connect_Failed_Count++;
-            Is_Client_Connecting = false;
-            LogUtil.LogD("ThreadLogin","Login Server Failed, Times: " + Connect_Failed_Count);
-            LoginFailed(Connect_Failed_Count);
-            // 连接失败，重新连接服务器
-            ReconnectServer();
-            return;
-        }
-
-        // 登录成功
-        Connect_Failed_Count = 0;
-        //stateone.IpEndPoint = (IPEndPoint)socket.RemoteEndPoint;
-        stateone.setClientType(ClientAlias);
-        stateone.WorkSocket = socket;
-        //stateone.WorkSocket.BeginReceive(stateone.BytesHead, stateone.AlreadyReceivedHead,
-                //stateone.BytesHead.Length - stateone.AlreadyReceivedHead, SocketFlags.None,
-                //new AsyncCallback(HeadReceiveCallback), stateone);
-
-        Thread receive = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                ThreadReceiveBackground();
-            }
-        });
-        receive.start();
-
-
-
-        // 发送一条验证消息
-        byte[] bytesTemp = new byte[16];
-
-        //BitConverter.GetBytes(DateTime.Now.Ticks).CopyTo(bytesTemp, 0);
-        SendBytes(stateone, NetSupport.CommandBytes(HslCommunicationCode.Hsl_Protocol_Check_Secends, 0, KeyToken, bytesTemp));
-
-
-        stateone.setHeartTime(new Date());
-        Is_Client_Start = true;
-        LoginSuccess();
-
-        LogUtil.LogD("ThreadLogin","Login Server Success, Times: " + Connect_Failed_Count);
-
-        Is_Client_Connecting = false;
-
-        ThreadSleep(1000);
-    }
-
-
-
-    private void ThreadReceiveBackground()
-    {
-        while (true)
-        {
-            OperateResult result = new OperateResult();
-            boolWith2Bytes value = ReceiveAndCheckBytes(stateone.WorkSocket, result, null,null);
-
-            if (!value.Result)
-            {
-                continue;
-            }
-
-            // 数据处理
-            byte[] buffer1= new byte[4];
-            buffer1[0] = value.Content[0];
-            buffer1[1] = value.Content[1];
-            buffer1[2] = value.Content[2];
-            buffer1[3] = value.Content[3];
-
-            byte[] buffer2= new byte[4];
-            buffer2[0] = value.Content[4];
-            buffer2[1] = value.Content[5];
-            buffer2[2] = value.Content[6];
-            buffer2[3] = value.Content[7];
-
-            int protocol = Utilities.bytes2Int(buffer1);
-            int customer = Utilities.bytes2Int(buffer2);
-
-            DataProcessingCenter(null,protocol,customer,value.Content2);
-        }
-    }
-
-
-    // private bool Is_reconnect_server = false;
-    // private object lock_reconnect_server = new object();
-
-
-    private void ReconnectServer()
-    {
-        // 是否连接服务器中，已经在连接的话，则不再连接
-        if (Is_Client_Connecting) return;
-        // 是否退出了系统，退出则不再重连
-        if (IsQuie) return;
-
-        LogUtil.LogI("ReconnectServer","Prepare ReConnect Server.");
-
-        // 触发连接失败，重连系统前错误
-        BeforReConnected();
-        CloseSocket(stateone.WorkSocket);
-
-        Thread thread_login = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                ThreadLogin();
-            }
-        });
-        thread_login.start();
-    }
-
-
-    /// <summary>
-    /// 通信出错后的处理
-    /// </summary>
-    /// <param name="receive"></param>
-    /// <param name="ex"></param>
-    void SocketReceiveException(AsyncStateOne receive, Exception ex)
-    {
-        if (ex.getMessage().contains(StringResources.SocketRemoteCloseException))
-        {
-            // 异常掉线
-            ReconnectServer();
-        }
-        else
-        {
-            // MessageAlerts?.Invoke("数据接收出错：" + ex.Message);
-        }
-
-        LogUtil.LogD("SocketReceiveException","Socket Excepiton Occured.");
-    }
-
-
-    /// <summary>
-    /// 服务器端用于数据发送文本的方法
-    /// </summary>
-    /// <param name="customer">用户自定义的命令头</param>
-    /// <param name="str">发送的文本</param>
-    public void Send(NetHandle customer, String str)
-    {
-        if (Is_Client_Start)
-        {
-            SendBytes(stateone, NetSupport.CommandBytes(customer.get_CodeValue(), KeyToken, str));
-        }
-    }
-    /// <summary>
-    /// 服务器端用于发送字节的方法
-    /// </summary>
-    /// <param name="customer">用户自定义的命令头</param>
-    /// <param name="bytes">实际发送的数据</param>
-    public void Send(NetHandle customer, byte[] bytes)
-    {
-        if (Is_Client_Start)
-        {
-            SendBytes(stateone, NetSupport.CommandBytes(customer.get_CodeValue(), KeyToken, bytes));
-        }
-    }
-
-    private void SendBytes(final AsyncStateOne stateone, final byte[] content)
-    {
-        Thread thread_login = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    stateone.WorkSocket.getOutputStream().write(content);
-                } catch (Exception ex) {
-
-                }
-            }
-        });
-        thread_login.start();
-        //SendBytesAsync(stateone, content);
-    }
-
-    /// <summary>
-    /// 客户端的数据处理中心
-    /// </summary>
-    /// <param name="receive"></param>
-    /// <param name="protocol"></param>
-    /// <param name="customer"></param>
-    /// <param name="content"></param>
-    void DataProcessingCenter(AsyncStateOne receive, int protocol, int customer, byte[] content)
-    {
-        if (protocol == HslCommunicationCode.Hsl_Protocol_Check_Secends)
-        {
-            //Date dt = new Date(BitConverter.ToInt64(content, 0));
-            //ServerTime = new Date(BitConverter.ToInt64(content, 8));
-            //DelayTime = (int)(new Date() - dt).TotalMilliseconds;
-            stateone.setHeartTime(new Date());
-            // MessageAlerts?.Invoke("心跳时间：" + DateTime.Now.ToString());
-        }
-        else if (protocol == HslCommunicationCode.Hsl_Protocol_Client_Quit)
-        {
-            // 申请了退出
-        }
-        else if (protocol == HslCommunicationCode.Hsl_Protocol_User_Bytes)
-        {
-            // 接收到字节数据
-            AcceptByte(new NetHandle(customer), content);
-        }
-        else if (protocol == HslCommunicationCode.Hsl_Protocol_User_String)
-        {
-            // 接收到文本数据
-            String str = Utilities.byte2String(content);
-            AcceptString(new NetHandle(customer), str);
-        }
-    }
-
-
-    private Thread thread_heart_check = null;
-
-    /// <summary>
-    /// 心跳线程的方法
-    /// </summary>
-    private void ThreadHeartCheck()
-    {
-
-        ThreadSleep(2000);
-        while (true)
-        {
-            ThreadSleep(1000);
-
-            if (!IsQuie)
-            {
-                byte[] send = new byte[16];
-                System.arraycopy(Utilities.long2Bytes(new Date().getTime()),0,send,0,8);
-                SendBytes(stateone, NetSupport.CommandBytes(HslCommunicationCode.Hsl_Protocol_Check_Secends, 0, KeyToken, send));
-                double timeSpan = (new Date().getTime() - stateone.getHeartTime().getTime())/1000;
-                if (timeSpan > 1 * 8)//8次没有收到失去联系
-                {
-                    LogUtil.LogD("ThreadHeartCheck","Heart Check Failed int "+timeSpan+" Seconds.");
-                    ReconnectServer();
-                    ThreadSleep(1000);
-                }
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Enthernet/NetSimplifyClient.java

@@ -1,137 +0,0 @@
-package com.example.HslCommunication.Enthernet;
-
-import com.example.HslCommunication.Core.Net.HslCommunicationCode;
-import com.example.HslCommunication.Core.Net.NetShareBase;
-import com.example.HslCommunication.Core.Net.ProgressReport;
-import com.example.HslCommunication.Core.Utilities.boolWith2Bytes;
-import com.example.HslCommunication.Core.Utilities.Utilities;
-import com.example.HslCommunication.Core.Types.NetHandle;
-import com.example.HslCommunication.Core.Types.OperateResultBytes;
-import com.example.HslCommunication.Core.Types.OperateResultString;
-import com.example.HslCommunication.Core.Utilities.boolWithSocket;
-import com.example.HslCommunication.Resources.StringResources;
-
-import java.io.InputStream;
-import java.net.Socket;
-import java.util.UUID;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public final class NetSimplifyClient extends NetShareBase {
-
-
-
-    /// <summary>
-    /// 实例化一个客户端的对象，用于和服务器通信
-    /// </summary>
-    public NetSimplifyClient(String ipAddress, int port, UUID token)
-    {
-        m_ipAddress = ipAddress;
-        m_port = port;
-        KeyToken = token;
-    }
-
-    private String m_ipAddress="127.0.0.1";
-    private int m_port=10000;
-
-    /// <summary>
-    /// 客户端向服务器进行请求，请求字符串数据
-    /// </summary>
-    /// <param name="customer">用户的指令头</param>
-    /// <param name="send">发送数据</param>
-    /// <param name="sendStatus">发送数据时的进度报告</param>
-    /// <param name="receiveStatus">接收数据时的进度报告</param>
-    /// <returns></returns>
-    public OperateResultString ReadFromServer(
-            NetHandle customer,
-            String send,
-            ProgressReport sendStatus,
-            ProgressReport receiveStatus
-    )
-    {
-        OperateResultString result = new OperateResultString();
-        byte[] data = Utilities.string2Byte(send);
-        OperateResultBytes temp = ReadFromServerBase(HslCommunicationCode.Hsl_Protocol_User_String, customer.get_CodeValue(), data, sendStatus, receiveStatus);
-        result.IsSuccess = temp.IsSuccess;
-        result.ErrorCode = temp.ErrorCode;
-        result.Message = temp.Message;
-        if (temp.IsSuccess)
-        {
-            result.Content = Utilities.byte2String(temp.Content);
-        }
-        temp = null;
-        return result;
-    }
-
-
-    /// <summary>
-    /// 客户端向服务器进行请求，请求字节数据
-    /// </summary>
-    /// <param name="customer">用户的指令头</param>
-    /// <param name="send"></param>
-    /// <param name="sendStatus">发送数据的进度报告</param>
-    /// <param name="receiveStatus">接收数据的进度报告</param>
-    /// <returns></returns>
-    public OperateResultBytes ReadFromServer(
-            NetHandle customer,
-            byte[] send,
-            ProgressReport sendStatus,
-            ProgressReport receiveStatus
-    )
-    {
-        return ReadFromServerBase(HslCommunicationCode.Hsl_Protocol_User_Bytes, customer.get_CodeValue(), send, sendStatus, receiveStatus);
-    }
-
-    /// <summary>
-    /// 需要发送的底层数据
-    /// </summary>
-    /// <param name="headcode">数据的指令头</param>
-    /// <param name="customer">用户的指令头</param>
-    /// <param name="send">需要发送的底层数据</param>
-    /// <param name="sendStatus">发送状态的进度报告，用于显示上传进度</param>
-    /// <param name="receiveStatus">接收状态的进度报告，用于显示下载进度</param>
-    /// <returns></returns>
-    private OperateResultBytes ReadFromServerBase(
-            int headcode,
-            int customer,
-            byte[] send,
-            ProgressReport sendStatus,
-            ProgressReport receiveStatus)
-    {
-        OperateResultBytes result = new OperateResultBytes();
-
-        // 创建并连接套接字
-        Socket socket=null;
-        boolWithSocket valueSocket=CreateSocketAndConnect(m_ipAddress, m_port,result);
-        if(!valueSocket.Result)
-        {
-            return result;
-        }
-
-        socket = valueSocket.Socket;
-
-        // 发送并检查数据是否发送完成
-        if (!SendBaseAndCheckReceive(socket, headcode, customer, send, result, sendStatus,null))
-        {
-            return result;
-        }
-
-        // 接收头数据和内容数据
-
-        boolWith2Bytes value = ReceiveAndCheckBytes(socket, result, receiveStatus,null);
-
-        if (!value.Result)
-        {
-            return result;
-        }
-
-        CloseSocket(socket);
-        result.Content = value.Content2;
-        result.IsSuccess = true;
-        return result;
-    }
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Profinet/PlcNetBase.java

@@ -1,72 +0,0 @@
-package com.example.HslCommunication.Profinet;
-
-import com.example.HslCommunication.Core.Net.NetBase;
-
-/**
- * Created by DATHLIN on 2017/11/3.
- */
-
-public abstract class PlcNetBase extends NetBase {
-
-
-    protected int m_PortRead = 1000;
-    protected int m_PortReadBackup = -1;
-    protected boolean m_IsPortNormal = true;
-    protected int m_PortWrite = 1001;
-
-
-
-    /// <summary>
-    /// 获取访问的端口号
-    /// </summary>
-    /// <returns></returns>
-    protected int GetPort()
-    {
-        if (m_PortReadBackup <= 0) return m_PortRead;
-        return m_IsPortNormal ? m_PortRead : m_PortReadBackup;
-    }
-    /// <summary>
-    /// 更换端口号
-    /// </summary>
-    protected void ChangePort()
-    {
-        m_IsPortNormal = !m_IsPortNormal;
-    }
-
-
-    public void setPortRead(int value) {
-        m_PortRead = value;
-    }
-
-
-    public int getPortRead()
-    {
-        return m_PortRead;
-    }
-
-
-    /// <summary>
-    /// 控制字节长度，超出选择截断，不够补零
-    /// </summary>
-    /// <param name="bytes">字节数据</param>
-    /// <param name="length">最终需要的目标长度</param>
-    /// <returns>处理后的数据</returns>
-    protected byte[] ManageBytesLength(byte[] bytes, int length)
-    {
-        if (bytes == null) return null;
-        byte[] temp = new byte[length];
-        if (length > bytes.length)
-        {
-            System.arraycopy(bytes, 0, temp, 0, bytes.length);
-        }
-        else
-        {
-            System.arraycopy(bytes, 0, temp, 0, length);
-        }
-        return temp;
-    }
-
-
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Profinet/SiemensPLCS.java

@@ -1,11 +0,0 @@
-package com.example.HslCommunication.Profinet;
-
-/**
- * Created by DATHLIN on 2017/11/3.
- */
-
-public enum SiemensPLCS {
-    S1200,
-    S300,
-    Smart200,
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Profinet/SiemensTcpNet.java

@@ -1,780 +0,0 @@
-package com.example.HslCommunication.Profinet;
-
-import com.example.HslCommunication.Core.Net.NetSupport;
-import com.example.HslCommunication.Core.Types.OperateResult;
-import com.example.HslCommunication.Core.Types.OperateResultBytes;
-import com.example.HslCommunication.Core.Utilities.Utilities;
-import com.example.HslCommunication.Core.Utilities.boolWithBytes;
-import com.example.HslCommunication.Core.Utilities.boolWithSiemens;
-import com.example.HslCommunication.Core.Utilities.boolWithSocket;
-
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.ArrayList;
-
-/**
- * Created by DATHLIN on 2017/11/3.
- */
-
-public final class SiemensTcpNet extends PlcNetBase {
-
-    /// <summary>
-    /// 实例化一个数据通信的对象，需要指定访问哪种Plc
-    /// </summary>
-    /// <param name="siemens"></param>
-    public SiemensTcpNet(SiemensPLCS siemens)
-    {
-        m_PortRead = 102;
-        m_PortWrite = 102;
-        CurrentPlc = siemens;
-
-        switch (siemens)
-        {
-            case S1200: plcHead1[18] = 1; break;
-            case S300: plcHead1[18] = 2; break;
-            case Smart200:plcHead1[18] = 1; break;
-            default: plcHead1[18] = 3; break;
-        }
-    }
-
-
-    /// <summary>
-    /// 可以手动设置PLC类型，用来测试原本不支持的数据访问功能
-    /// </summary>
-    /// <param name="type"></param>
-    public void SetPlcType(byte type)
-    {
-        plcHead1[18] = type;
-    }
-
-    private String ipAddress="";
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-
-    private boolWithBytes ReceiveBytesFromSocket(Socket socket)
-    {
-        boolWithBytes value =new boolWithBytes();
-        try
-        {
-            // 先接收4个字节的数据
-            byte[] head = NetSupport.ReadBytesFromSocket(socket, 4);
-            int receive = head[2] * 256 + head[3];
-            value.Content = new byte[receive];
-            System.arraycopy(head,0,value.Content,0, 4);
-            byte[] data = NetSupport.ReadBytesFromSocket(socket, receive - 4);
-            System.arraycopy(data,0,value.Content,4,data.length);
-            value.Result=true;
-            return value;
-        }
-        catch(Exception ex)
-        {
-            CloseSocket(socket);
-            return value;
-        }
-    }
-
-    private boolean SendBytesToSocket(Socket socket, byte[] data)
-    {
-        try
-        {
-            if (data != null)
-            {
-                OutputStream outputStream = socket.getOutputStream();
-                outputStream.write(data);
-            }
-            return true;
-        }
-        catch(Exception ex)
-        {
-            CloseSocket(socket);
-            return false;
-        }
-    }
-
-
-    private int CalculateAddressStarted(String address)
-    {
-        if (address.indexOf('.') < 0)
-        {
-            return Integer.parseInt(address) * 8;
-        }
-        else
-        {
-            String[] temp = address.split("\\.");
-            return Integer.parseInt(temp[0]) * 8 + Integer.parseInt(temp[1]);
-        }
-    }
-
-    /// <summary>
-    /// 解析数据地址
-    /// </summary>
-    /// <param name="address">数据地址</param>
-    /// <param name="type">类型</param>
-    /// <param name="startAddress">其实地址</param>
-    /// <param name="dbAddress">DB块地址</param>
-    /// <param name="result">结果数据对象</param>
-    /// <returns></returns>
-    private boolWithSiemens AnalysisAddress(String address, OperateResult result)
-    {
-        boolWithSiemens value = new boolWithSiemens();
-        try
-        {
-            value.dbAddress = 0;
-            if (address.charAt(0) == 'I')
-            {
-                value.type = -127;
-                value.startAddress = CalculateAddressStarted(address.substring(1));
-            }
-            else if (address.charAt(0) == 'Q')
-            {
-                value.type = -126;
-                value.startAddress = CalculateAddressStarted(address.substring(1));
-            }
-            else if (address.charAt(0) == 'M')
-            {
-                value.type = -125;
-                value.startAddress = CalculateAddressStarted(address.substring(1));
-            }
-            else if (address.charAt(0) == 'D' || address.substring(0, 2) == "DB")
-            {
-                value.type = -124;
-                String[] adds = address.split("\\.");
-                if (address.charAt(1) == 'B')
-                {
-                    value.dbAddress = Short.parseShort(adds[0].substring(2));
-                }
-                else
-                {
-                    value.dbAddress = Short.parseShort(adds[0].substring(1));
-                }
-
-                value.startAddress = CalculateAddressStarted(address.substring(address.indexOf('.') + 1));
-            }
-            else
-            {
-                result.Message = "不支持的数据类型";
-                value.type = 0;
-                value.startAddress = 0;
-                value.dbAddress = 0;
-                return value;
-            }
-        }
-        catch (Exception ex)
-        {
-            result.Message = ex.getMessage();
-            return value;
-        }
-
-        value.Result=true;
-        return value;
-    }
-
-    private boolean InitilizationConnect(Socket socket,OperateResult result)
-    {
-        // 发送初始化信息
-        if(!SendBytesToSocket(socket,plcHead1))
-        {
-            result.Message = "初始化信息发送失败";
-            return false;
-        }
-
-        if(!ReceiveBytesFromSocket(socket).Result)
-        {
-            result.Message = "初始化信息接收失败";
-            return false;
-        }
-
-        if(!SendBytesToSocket(socket,plcHead2))
-        {
-            result.Message = "初始化信息发送失败";
-            return false;
-        }
-
-        if(!ReceiveBytesFromSocket(socket).Result)
-        {
-            result.Message = "初始化信息接收失败";
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /// <summary>
-    /// 从PLC读取数据，地址格式为I100，Q100，DB20.100，M100，以字节为单位
-    /// </summary>
-    /// <param name="address">起始地址，格式为I100，M100，Q100，DB20.100</param>
-    /// <param name="count">读取的数量，以字节为单位</param>
-    /// <returns></returns>
-    public OperateResultBytes ReadFromPLC(String address, short count)
-    {
-        return ReadFromPLC(new String[] { address }, new short[] { count });
-    }
-
-
-    /// <summary>
-    /// 一次性从PLC获取所有的数据，按照先后顺序返回一个统一的Buffer，需要按照顺序处理，两个数组长度必须一致
-    /// </summary>
-    /// <param name="address">起始地址数组</param>
-    /// <param name="count">数据长度数组</param>
-    /// <returns></returns>
-    public OperateResultBytes ReadFromPLC(String[] address, short[] count)
-    {
-        OperateResultBytes result = new OperateResultBytes();
-
-        if (address == null)
-        {
-            result.Message = "地址不能为空";
-            return result;
-        }
-
-
-        if (count == null)
-        {
-            result.Message = "数量不能为空";
-            return result;
-        }
-        if (address.length != count.length) {
-            result.Message = "两个参数的个数不统一";
-            return result;
-        }
-
-        Socket socket;
-        boolWithSocket value = CreateSocketAndConnect(ipAddress,getPortRead(), result);
-        if (!value.Result)
-        {
-            ChangePort();
-            return result;
-        }
-
-        socket = value.Socket;
-        if (!InitilizationConnect(socket, result))
-        {
-            return result;
-        }
-
-
-        // 分批次进行读取，计算总批次
-        int times = address.length / 255;
-        if (address.length % 255 > 0)
-        {
-            times++;
-        }
-
-        // 缓存所有批次的结果
-        ArrayList<byte[]> arrays_bytes = new ArrayList<byte[]>();
-
-        for (int jj = 0; jj < times; jj++)
-        {
-            // 计算本批次需要读取的数据
-            int startIndex = jj * 255;
-            int readCount = address.length - startIndex;
-            if (readCount > 255)
-            {
-                readCount = 255;
-            }
-
-            byte[] _PLCCommand = new byte[19 + readCount * 12];
-            // 报文头
-            _PLCCommand[0] = 0x03;
-            _PLCCommand[1] = 0x00;
-            // 长度
-            _PLCCommand[2] = (byte)(_PLCCommand.length / 256);
-            _PLCCommand[3] = (byte)(_PLCCommand.length % 256);
-            // 固定
-            _PLCCommand[4] = 0x02;
-            _PLCCommand[5] = -16;
-            _PLCCommand[6] = -128;
-            _PLCCommand[7] = 0x32;
-            // 命令：发
-            _PLCCommand[8] = 0x01;
-            // 标识序列号
-            _PLCCommand[9] = 0x00;
-            _PLCCommand[10] = 0x00;
-            _PLCCommand[11] = 0x00;
-            _PLCCommand[12] = 0x01;
-            // 命令数据总长度
-            _PLCCommand[13] = (byte)((_PLCCommand.length - 17) / 256);
-            _PLCCommand[14] = (byte)((_PLCCommand.length - 17) % 256);
-
-            _PLCCommand[15] = 0x00;
-            _PLCCommand[16] = 0x00;
-
-            // 命令起始符
-            _PLCCommand[17] = 0x04;
-            // 读取数据块个数
-            _PLCCommand[18] = (byte)readCount;
-
-            int receiveCount = 0;
-            for (int ii = 0; ii < readCount; ii++)
-            {
-                receiveCount += count[ii + 255 * jj];
-
-                boolWithSiemens siemens = AnalysisAddress(address[ii + 255 * jj], result);
-                // 填充数据
-                if (!siemens.Result)
-                {
-                    CloseSocket(socket);
-                    return result;
-                }
-
-                // 读取地址的前缀
-                _PLCCommand[19 + ii * 12] = 0x12;
-                _PLCCommand[20 + ii * 12] = 0x0A;
-                _PLCCommand[21 + ii * 12] = 0x10;
-                _PLCCommand[22 + ii * 12] = 0x02;
-                // 访问数据的个数
-                _PLCCommand[23 + ii * 12] = (byte)(count[ii + 255 * jj] / 256);
-                _PLCCommand[24 + ii * 12] = (byte)(count[ii + 255 * jj] % 256);
-                // DB块编号，如果访问的是DB块的话
-                _PLCCommand[25 + ii * 12] = (byte)(siemens.dbAddress / 256);
-                _PLCCommand[26 + ii * 12] = (byte)(siemens.dbAddress % 256);
-                // 访问数据类型
-                _PLCCommand[27 + ii * 12] = siemens.type;
-                // 偏移位置
-                _PLCCommand[28 + ii * 12] = (byte)(siemens.startAddress / 256 / 256);
-                _PLCCommand[29 + ii * 12] = (byte)(siemens.startAddress / 256);
-                _PLCCommand[30 + ii * 12] = (byte)(siemens.startAddress % 256);
-            }
-
-
-            if (!SendBytesToSocket(socket, _PLCCommand))
-            {
-                result.Message = "发送读取信息失败";
-                return result;
-            }
-
-            boolWithBytes content=ReceiveBytesFromSocket(socket);
-            if (!content.Result)
-            {
-                result.Message = "接收信息失败";
-                return result;
-            }
-
-            if (content.Content.length != receiveCount + readCount * 4 + 21)
-            {
-                CloseSocket(socket);
-                result.Message = "数据长度校验失败";
-                result.Content = content.Content;
-                return result;
-            }
-
-            // 分次读取成功
-            byte[] buffer = new byte[receiveCount];
-            int kk = 21;
-            int ll = 0;
-            for (int ii = 0; ii < readCount; ii++)
-            {
-                // 将数据挪回正确的地方
-                System.arraycopy(content, kk + 4, buffer, ll, count[ii + 255 * jj]);
-                kk += count[ii + 255 * jj] + 4;
-                ll += count[ii + 255 * jj];
-            }
-            arrays_bytes.add(buffer);
-        }
-
-
-        if (arrays_bytes.size() == 1)
-        {
-            result.Content = arrays_bytes.get(0);
-        }
-        else
-        {
-            int length = 0;
-            int offset = 0;
-
-            // 获取长度并生成缓冲数据
-
-            for(int ii=0;ii<arrays_bytes.size();ii++)
-            {
-                length += arrays_bytes.get(ii).length;
-            }
-
-            result.Content = new byte[length];
-
-            // 复制数据操作
-            for(int ii=0;ii<arrays_bytes.size();ii++)
-            {
-                System.arraycopy(arrays_bytes.get(ii),0,result.Content,offset,arrays_bytes.get(ii).length);
-                offset+=arrays_bytes.get(ii).length;
-            }
-            arrays_bytes.clear();
-        }
-        result.IsSuccess = true;
-        CloseSocket(socket);
-        //所有的数据接收完成，进行返回
-        return result;
-    }
-
-    /// <summary>
-    /// 将数据写入到PLC数据，地址格式为I100，Q100，DB20.100，M100，以字节为单位
-    /// </summary>
-    /// <param name="address">起始地址，格式为I100，M100，Q100，DB20.100</param>
-    /// <param name="data">写入的数据，长度根据data的长度来指示</param>
-    /// <returns></returns>
-    public OperateResult WriteIntoPLC(String address, byte[] data)
-    {
-        OperateResult result = new OperateResult();
-
-
-        Socket socket;
-        boolWithSocket value = CreateSocketAndConnect(ipAddress,getPortRead(), result);
-        if (!value.Result)
-        {
-            ChangePort();
-            return result;
-        }
-
-        socket = value.Socket;
-        if (!InitilizationConnect(socket, result))
-        {
-            return result;
-        }
-
-
-        if (data == null) data = new byte[0];
-
-        boolWithSiemens siemens = AnalysisAddress(address, result);
-        // 填充数据
-        if (!siemens.Result)
-        {
-            CloseSocket(socket);
-            return result;
-        }
-
-
-        byte[] _PLCCommand = new byte[35 + data.length];
-        _PLCCommand[0] = 0x03;
-        _PLCCommand[1] = 0x00;
-        // 长度
-        _PLCCommand[2] = (byte)((35 + data.length) / 256);
-        _PLCCommand[3] = (byte)((35 + data.length) % 256);
-        // 固定
-        _PLCCommand[4] = 0x02;
-        _PLCCommand[5] = -16;
-        _PLCCommand[6] = -128;
-        _PLCCommand[7] = 0x32;
-        // 命令 发
-        _PLCCommand[8] = 0x01;
-        // 标识序列号
-        _PLCCommand[9] = 0x00;
-        _PLCCommand[10] = 0x00;
-        _PLCCommand[11] = 0x00;
-        _PLCCommand[12] = 0x01;
-        // 固定
-        _PLCCommand[13] = 0x00;
-        _PLCCommand[14] = 0x0E;
-        // 写入长度+4
-        _PLCCommand[15] = (byte)((4 + data.length) / 256);
-        _PLCCommand[16] = (byte)((4 + data.length) % 256);
-        // 命令起始符
-        _PLCCommand[17] = 0x05;
-        // 写入数据块个数
-        _PLCCommand[18] = 0x01;
-        // 固定，返回数据长度
-        _PLCCommand[19] = 0x12;
-        _PLCCommand[20] = 0x0A;
-        _PLCCommand[21] = 0x10;
-        // 写入方式，1是按位，2是按字
-        _PLCCommand[22] = 0x02;
-        // 写入数据的个数
-        _PLCCommand[23] = (byte)(data.length / 256);
-        _PLCCommand[24] = (byte)(data.length % 256);
-        // DB块编号，如果访问的是DB块的话
-        _PLCCommand[25] = (byte)(siemens.dbAddress / 256);
-        _PLCCommand[26] = (byte)(siemens.dbAddress % 256);
-        // 写入数据的类型
-        _PLCCommand[27] = siemens.type;
-        // 偏移位置
-        _PLCCommand[28] = (byte)(siemens.startAddress / 256 / 256);;
-        _PLCCommand[29] = (byte)(siemens.startAddress / 256);
-        _PLCCommand[30] = (byte)(siemens.startAddress % 256);
-        // 按字写入
-        _PLCCommand[31] = 0x00;
-        _PLCCommand[32] = 0x04;
-        // 按位计算的长度
-        _PLCCommand[33] = (byte)(data.length * 8 / 256);
-        _PLCCommand[34] = (byte)(data.length * 8 % 256);
-
-        System.arraycopy(data,0,_PLCCommand,35,data.length);
-
-        if(!SendBytesToSocket(socket,_PLCCommand))
-        {
-            result.Message = "发送写入信息失败";
-            return result;
-        }
-
-        boolWithBytes value2=ReceiveBytesFromSocket(socket);
-        if (!value2.Result)
-        {
-            result.Message = "接收信息失败";
-            return result;
-        }
-
-        if (value2.Content[value2.Content.length - 1] != 0xFF)
-        {
-            // 写入异常
-            CloseSocket(socket);
-            result.Message = "写入数据异常";
-            return result;
-        }
-
-        CloseSocket(socket);
-        result.IsSuccess = true;
-        return result;
-    }
-
-
-    /// <summary>
-    /// 写入PLC的一个位，例如"M100.6"，"I100.7"，"Q100.0"，"DB20.100.0"，如果只写了"M100"默认为"M100.0
-    /// </summary>
-    /// <param name="address"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public OperateResult WriteIntoPLC(String address, boolean data)
-    {
-        OperateResult result = new OperateResult();
-
-        Socket socket;
-        boolWithSocket value = CreateSocketAndConnect(getIpAddress(),m_PortWrite, result);
-        if (!value.Result)
-        {
-            ChangePort();
-            return result;
-        }
-
-        socket = value.Socket;
-        if (!InitilizationConnect(socket, result))
-        {
-            return result;
-        }
-
-
-
-        byte[] buffer = new byte[1];
-        buffer[0] = data ? (byte)0x01 : (byte)0x00;
-
-        boolWithSiemens siemens = AnalysisAddress(address, result);
-        // 填充数据
-        if (!siemens.Result)
-        {
-            CloseSocket(socket);
-            return result;
-        }
-
-
-
-        byte[] _PLCCommand = new byte[35 + buffer.length];
-        _PLCCommand[0] = 0x03;
-        _PLCCommand[1] = 0x00;
-        // 长度
-        _PLCCommand[2] = (byte)((35 + buffer.length) / 256);
-        _PLCCommand[3] = (byte)((35 + buffer.length) % 256);
-        // 固定
-        _PLCCommand[4] = 0x02;
-        _PLCCommand[5] = -16;
-        _PLCCommand[6] = -128;
-        _PLCCommand[7] = 0x32;
-        // 命令 发
-        _PLCCommand[8] = 0x01;
-        // 标识序列号
-        _PLCCommand[9] = 0x00;
-        _PLCCommand[10] = 0x00;
-        _PLCCommand[11] = 0x00;
-        _PLCCommand[12] = 0x01;
-        // 固定
-        _PLCCommand[13] = 0x00;
-        _PLCCommand[14] = 0x0E;
-        // 写入长度+4
-        _PLCCommand[15] = (byte)((4 + buffer.length) / 256);
-        _PLCCommand[16] = (byte)((4 + buffer.length) % 256);
-        // 命令起始符
-        _PLCCommand[17] = 0x05;
-        // 写入数据块个数
-        _PLCCommand[18] = 0x01;
-        _PLCCommand[19] = 0x12;
-        _PLCCommand[20] = 0x0A;
-        _PLCCommand[21] = 0x10;
-        // 写入方式，1是按位，2是按字
-        _PLCCommand[22] = 0x01;
-        // 写入数据的个数
-        _PLCCommand[23] = (byte)(buffer.length / 256);
-        _PLCCommand[24] = (byte)(buffer.length % 256);
-        // DB块编号，如果访问的是DB块的话
-        _PLCCommand[25] = (byte)(siemens.dbAddress / 256);
-        _PLCCommand[26] = (byte)(siemens.dbAddress % 256);
-        // 写入数据的类型
-        _PLCCommand[27] = siemens.type;
-        // 偏移位置
-        _PLCCommand[28] = (byte)(siemens.startAddress / 256 / 256);
-        _PLCCommand[29] = (byte)(siemens.startAddress / 256);
-        _PLCCommand[30] = (byte)(siemens.startAddress % 256);
-        // 按位写入
-        _PLCCommand[31] = 0x00;
-        _PLCCommand[32] = 0x03;
-        // 按位计算的长度
-        _PLCCommand[33] = (byte)(buffer.length / 256);
-        _PLCCommand[34] = (byte)(buffer.length % 256);
-
-        System.arraycopy(buffer,0,_PLCCommand,35,buffer.length);
-
-        if(!SendBytesToSocket(socket,_PLCCommand))
-        {
-            result.Message = "发送写入信息失败";
-            return result;
-        }
-
-        boolWithBytes value2=ReceiveBytesFromSocket(socket);
-        if (!value2.Result)
-        {
-            result.Message = "接收信息失败";
-            return result;
-        }
-
-        if (value2.Content[value2.Content.length - 1] != 0xFF)
-        {
-            // 写入异常
-            CloseSocket(socket);
-            result.Message = "写入数据异常";
-            return result;
-        }
-
-        CloseSocket(socket);
-        result.IsSuccess = true;
-        return result;
-    }
-
-    /// <summary>
-    /// 从返回的西门子数组中获取short数组数据，已经内置高地位转换
-    /// </summary>
-    /// <param name="bytes"></param>
-    /// <returns></returns>
-    public short[] GetArrayFromBytes(byte[] bytes)
-    {
-        short[] temp = new short[bytes.length / 2];
-        for (int i = 0; i < temp.length; i++)
-        {
-            byte[] buffer = new byte[2];
-            buffer[0] = bytes[i * 2 + 1];
-            buffer[1] = bytes[i * 2];
-            temp[i] = Utilities.byte2Short(buffer, 0);
-        }
-        return temp;
-    }
-
-    /// <summary>
-    /// 从返回的西门子数组中获取int数组数据，已经内置高地位转换
-    /// </summary>
-    /// <param name="bytes"></param>
-    /// <returns></returns>
-    public int[] GetIntArrayFromBytes(byte[] bytes)
-    {
-        int[] temp = new int[bytes.length / 4];
-        for (int i = 0; i < temp.length; i++)
-        {
-            byte[] buffer = new byte[4];
-            buffer[0] = bytes[i * 4 + 0];
-            buffer[1] = bytes[i * 4 + 1];
-            buffer[2] = bytes[i * 4 + 2];
-            buffer[3] = bytes[i * 4 + 3];
-            temp[i] = Utilities.bytes2Int(buffer);
-        }
-        return temp;
-    }
-
-    /// <summary>
-    /// 根据索引位转换获取short数据
-    /// </summary>
-    /// <param name="content"></param>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public short GetShortFromBytes(byte[] content, int index)
-    {
-        byte[] buffer = new byte[2];
-        buffer[0] = content[index + 0];
-        buffer[1] = content[index + 1];
-        return Utilities.byte2Short(buffer,0);
-    }
-
-
-    /// <summary>
-    /// 根据索引位转换获取int数据
-    /// </summary>
-    /// <param name="content"></param>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public int GetIntFromBytes(byte[] content, int index)
-    {
-        byte[] buffer = new byte[4];
-        buffer[0] = content[index + 0];
-        buffer[1] = content[index + 1];
-        buffer[2] = content[index + 2];
-        buffer[3] = content[index + 3];
-        return Utilities.bytes2Int(buffer);
-    }
-
-    private byte[] plcHead1 =
-    {
-        0x03,  // 报文头
-                0x00,
-                0x00,  // 数据长度
-                0x16,
-                0x11,
-                -32,
-                0x00,
-                0x00,
-                0x00,
-                0x01,
-                0x00,
-                -63,
-                0x02,
-                0x10,
-                0x00,
-                -62,
-                0x02,
-                0x03,
-                0x01,  // 指示cpu
-                -64,
-                0x01,
-                0x0A
-    };
-    private byte[] plcHead2 =
-            {
-                    0x03,
-                    0x00,
-                    0x00,
-                    0x19,
-                    0x02,
-                    -16,
-                    -128,
-                    0x32,
-                    0x01,
-                    0x00,
-                    0x00,
-                    -52,
-                    -63,
-                    0x00,
-                    0x08,
-                    0x00,
-                    0x00,
-                    -16,
-                    0x00,
-                    0x00,
-                    0x01,
-                    0x00,
-                    0x01,
-                    0x03,
-                    -64
-            };
-
-    private SiemensPLCS CurrentPlc = SiemensPLCS.S1200;
-
-
-}

AndroidTemplate/app/src/main/java/com/example/HslCommunication/Resources/StringResources.java

@@ -1,95 +0,0 @@
-package com.example.HslCommunication.Resources;
-
-/**
- * Created by DATHLIN on 2017/11/2.
- */
-
-public class StringResources {
-
-
-    /***********************************************************************************
-            *
-            *    一般的错误信息
-         *
-                 ************************************************************************************/
-
-
-    public static final String ConnectedFailed = "连接失败";
-    public static final String UnknownError = "未知错误";
-    public static final String ErrorCode = "错误代号";
-    public static final String TextDescription = "文本描述";
-    public static final String ExceptionMessage = "错误信息：";
-    public static final String ExceptionStackTrace = "错误堆栈：";
-    public static final String ExceptopnTargetSite = "错误方法：";
-    public static final String ExceprionCustomer = "用户自定义方法出错：";
-
-
-
-    /***********************************************************************************
-     *
-     *    系统相关的错误信息
-     *
-     ************************************************************************************/
-
-    public static final String SystemInstallOperater = "安装新系统：IP为";
-    public static final String SystemUpdateOperater = "更新新系统：IP为";
-
-
-    /***********************************************************************************
-     *
-     *    套接字相关的信息描述
-     *
-     ************************************************************************************/
-
-    public static final String SocketIOException = "套接字传送数据异常：";
-    public static final String SocketSendException = "同步数据发送异常：";
-    public static final String SocketHeadReceiveException = "指令头接收异常：";
-    public static final String SocketContentReceiveException = "内容数据接收异常：";
-    public static final String SocketContentRemoteReceiveException = "对方内容数据接收异常：";
-    public static final String SocketAcceptCallbackException = "异步接受传入的连接尝试";
-    public static final String SocketReAcceptCallbackException = "重新异步接受传入的连接尝试";
-    public static final String SocketSendAsyncException = "异步数据发送出错:";
-    public static final String SocketEndSendException = "异步数据结束挂起发送出错";
-    public static final String SocketReceiveException = "异步数据发送出错:";
-    public static final String SocketEndReceiveException = "异步数据结束接收指令头出错";
-    public static final String SocketRemoteCloseException = "远程主机强迫关闭了一个现有的连接";
-
-
-    /***********************************************************************************
-     *
-     *    文件相关的信息
-     *
-     ************************************************************************************/
-
-
-    public static final String FileDownloadSuccess = "文件下载成功";
-    public static final String FileDownloadFailed = "文件下载异常";
-    public static final String FileUploadFailed = "文件上传异常";
-    public static final String FileUploadSuccess = "文件上传成功";
-    public static final String FileDeleteFailed = "文件删除异常";
-    public static final String FileDeleteSuccess = "文件删除成功";
-    public static final String FileReceiveFailed = "确认文件接收异常";
-    public static final String FileNotExist = "文件不存在";
-    public static final String FileSaveFailed = "文件存储失败";
-    public static final String FileLoadFailed = "文件加载失败";
-    public static final String FileSendClientFailed = "文件发送的时候发生了异常";
-    public static final String FileWriteToNetFailed = "文件写入网络异常";
-    public static final String FileReadFromNetFailed = "从网络读取文件异常";
-
-    /***********************************************************************************
-     *
-     *    服务器的引擎相关数据
-     *
-     ************************************************************************************/
-
-    public static final String TokenCheckFailed = "接收验证令牌不一致";
-    public static final String TokenCheckTimeout = "接收验证超时:";
-    public static final String NetClientAliasFailed = "客户端的别名接收失败：";
-    public static final String NetEngineStart = "启动引擎";
-    public static final String NetEngineClose = "关闭引擎";
-    public static final String NetClientOnline = "上线";
-    public static final String NetClientOffline = "下线";
-    public static final String NetClientBreak = "异常掉线";
-    public static final String NetClientFull = "服务器承载上限，收到超出的请求连接。";
-    public static final String NetClientLoginFailed = "客户端登录中错误：";
-}

AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/CommonLibrary/SimplifyHeadCode.java

@@ -1,6 +1,7 @@
 package com.example.UserSoftwareAndroidTemplate.CommonLibrary;
 
-import com.example.HslCommunication.Core.Types.NetHandle;
+
+import HslCommunication.Core.Net.NetHandle;
 
 /**
  * Created by hsl20 on 2017/11/5.

AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/LogUtil.java

@@ -1,14 +1,8 @@
-package com.example.HslCommunication.Log;
+package com.example.UserSoftwareAndroidTemplate;
 
 import android.util.Log;
 
-/**
- * Created by hsl20 on 2017/11/4.
- * 一个扩展的日志工具，用来实现对记录日志的特殊处理，屏蔽操作
- */
-
 public class LogUtil {
-
     public static final int VerBose = 1;
 
     public static final int Debug = 2;
@@ -23,9 +17,9 @@ public class LogUtil {
 
     public static int Level = VerBose;
 
-    /*
+    /**
         记录零碎的日志
-     */
+     **/
     public static void LogV(String tag, String msg) {
         if (Level <= VerBose) Log.v(tag, msg);
     }
@@ -64,5 +58,4 @@ public class LogUtil {
     public static void LogE(String tag, String msg, Exception ex) {
         if (Level <= Error) Log.e(tag, msg, ex);
     }
-
 }

AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/LoginSupport/LoginActivity.java

@@ -22,12 +22,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.example.HslCommunication.BasicFramework.SystemVersion;
-import com.example.HslCommunication.Core.Types.NetHandle;
-import com.example.HslCommunication.Core.Types.OperateResultString;
-import com.example.HslCommunication.Log.LogUtil;
+
 import com.example.UserSoftwareAndroidTemplate.CommonLibrary.SimplifyHeadCode;
 import com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount;
+import com.example.UserSoftwareAndroidTemplate.LogUtil;
 import com.example.UserSoftwareAndroidTemplate.MainActivity;
 import com.example.UserSoftwareAndroidTemplate.R;
 import com.example.UserSoftwareAndroidTemplate.UserClient;
@@ -39,6 +37,10 @@ import org.json.JSONObject;
 
 import java.util.Date;
 
+import HslCommunication.BasicFramework.SystemVersion;
+import HslCommunication.Core.Net.NetHandle;
+import HslCommunication.Core.Types.OperateResultExOne;
+
 import static com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount.FrameworkVersion;
 
 public class LoginActivity extends AppCompatActivity {
@@ -205,7 +207,7 @@ public class LoginActivity extends AppCompatActivity {
 
             LogUtil.LogD("loginSystem","开始请求维护检查");
             // 第一步请求维护状态
-            OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.维护检查, "", null, null);
+            OperateResultExOne<String> result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.维护检查, "");
             if (!result.IsSuccess) {
                 MessageShow(result.ToMessageShowString());
                 return;
@@ -226,7 +228,7 @@ public class LoginActivity extends AppCompatActivity {
             jsonObject.addProperty(FrameworkVersion, UserClient.FrameworkVersion.toString());
 
             LogUtil.LogD("loginSystem",jsonObject.toString());
-            result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.账户检查, jsonObject.toString(), null, null);
+            result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.账户检查, jsonObject.toString());
             if (!result.IsSuccess) {
                 MessageShow(result.ToMessageShowString());
                 return;
@@ -249,7 +251,7 @@ public class LoginActivity extends AppCompatActivity {
 
             LogUtil.LogD("loginSystem","开始请求版本检查");
             // 第三步检查版本
-            result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.更新检查, "", null, null);
+            result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.更新检查, "");
             if (!result.IsSuccess) {
                 MessageShow(result.ToMessageShowString());
                 return;
@@ -276,7 +278,7 @@ public class LoginActivity extends AppCompatActivity {
 
             LogUtil.LogD("loginSystem","开始请求数据下载");
             // 下载服务器数据
-            result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.参数下载,"",null,null);
+            result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.参数下载,"");
             if (result.IsSuccess) {
                 // 服务器返回初始化的数据，此处进行数据的提取，有可能包含了多个数据
                 JsonBeanPara para = new Gson().fromJson(result.Content, JsonBeanPara.class);

AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/LoginSupport/SplashActivity.java

@@ -10,17 +10,18 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.example.HslCommunication.BasicFramework.SystemVersion;
-import com.example.HslCommunication.Core.Types.OperateResultString;
-import com.example.HslCommunication.Log.LogUtil;
 import com.example.UserSoftwareAndroidTemplate.CommonLibrary.SimplifyHeadCode;
 import com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount;
+import com.example.UserSoftwareAndroidTemplate.LogUtil;
 import com.example.UserSoftwareAndroidTemplate.MainActivity;
 import com.example.UserSoftwareAndroidTemplate.R;
 import com.example.UserSoftwareAndroidTemplate.UserClient;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
+import HslCommunication.BasicFramework.SystemVersion;
+import HslCommunication.Core.Types.OperateResultExOne;
+
 import static com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount.FrameworkVersion;
 
 
@@ -139,7 +140,7 @@ public class SplashActivity extends AppCompatActivity {
 
 
         // 第一步请求维护状态
-        OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.维护检查, "", null, null);
+        OperateResultExOne<String> result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.维护检查, "");
         if (!result.IsSuccess) {
             MessageShow(result.ToMessageShowString());
             return FAILURE;
@@ -167,7 +168,7 @@ public class SplashActivity extends AppCompatActivity {
         jsonObject.addProperty(FrameworkVersion, UserClient.FrameworkVersion.toString());
 
         LogUtil.LogD("loginSystem",jsonObject.toString());
-        result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.账户检查, jsonObject.toString(), null, null);
+        result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.账户检查, jsonObject.toString());
         if (!result.IsSuccess) {
             MessageShow(result.ToMessageShowString());
             return FAILURE;
@@ -184,7 +185,7 @@ public class SplashActivity extends AppCompatActivity {
 
         LogUtil.LogD("loginSystem","开始请求版本检查");
         // 第三步检查版本
-        result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.更新检查, "", null, null);
+        result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.更新检查, "");
         if (!result.IsSuccess) {
             MessageShow(result.ToMessageShowString());
             return FAILURE;
@@ -211,7 +212,7 @@ public class SplashActivity extends AppCompatActivity {
 
         LogUtil.LogD("loginSystem","开始请求数据下载");
         // 下载服务器数据
-        result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.参数下载,"",null,null);
+        result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.参数下载,"");
         if (result.IsSuccess) {
             // 服务器返回初始化的数据，此处进行数据的提取，有可能包含了多个数据
             JsonBeanPara para = new Gson().fromJson(result.Content, JsonBeanPara.class);

AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/MainActivity.java

@@ -13,9 +13,7 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.example.HslCommunication.Core.Types.NetHandle;
-import com.example.HslCommunication.Core.Types.OperateResultString;
-import com.example.HslCommunication.Enthernet.NetSimplifyClient;
+import com.example.UserSoftwareAndroidTemplate.CommonLibrary.SimplifyHeadCode;
 import com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount;
 import com.example.UserSoftwareAndroidTemplate.LoginSupport.LoginActivity;
 import com.example.UserSoftwareAndroidTemplate.LoginSupport.SplashActivity;
@@ -23,6 +21,9 @@ import com.google.gson.Gson;
 
 import java.util.UUID;
 
+import HslCommunication.Core.Net.NetHandle;
+import HslCommunication.Core.Types.OperateResultExOne;
+
 public class MainActivity extends AppCompatActivity {
 
     public MainActivity()
@@ -39,7 +40,7 @@ public class MainActivity extends AppCompatActivity {
             if (msg.arg1 == 1) {
 
                 // 说明是一个网络的请求访问
-                OperateResultString result = (OperateResultString) msg.obj;
+                OperateResultExOne<String> result = (OperateResultExOne<String>) msg.obj;
                 if (result.IsSuccess) {
                     TextView textView = (TextView) findViewById(R.id.textViewMain);
                     textView.setText(result.Content);
@@ -60,9 +61,10 @@ public class MainActivity extends AppCompatActivity {
         public void run() {
             // 在这里进行网络请求相关操作
             Message msg = new Message();
-            OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(new NetHandle(1,2, 15),"",null,null);
+                OperateResultExOne<String> result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.获取账户,"");
+
+                msg.obj = result;
             msg.arg1=1;
-            msg.obj = result;
             handler.sendMessage(msg);
         }
     };

AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/UserClient.java

@@ -1,9 +1,12 @@
 package com.example.UserSoftwareAndroidTemplate;
 
-import com.example.HslCommunication.BasicFramework.SystemVersion;
-import com.example.HslCommunication.Enthernet.NetSimplifyClient;
+
 import com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount;
 
+import HslCommunication.BasicFramework.SystemVersion;
+import HslCommunication.Enthernet.SimplifyNet.NetSimplifyClient;
+
+
 import java.util.List;
 import java.util.UUID;
 
@@ -13,18 +16,19 @@ import java.util.UUID;
 
 public class UserClient {
 
+
     public static SystemVersion FrameworkVersion = new SystemVersion("1.7.5");
     public static SystemVersion CurrentVersion = new SystemVersion("1.0.0.171026");
     public static String SettingsFileName = "Settings";
 
 
-    public static String ServerIp = "117.48.203.204";
+    public static String ServerIp = "192.168.1.110";
     public static int PortSecondary = 14568;
     public static UUID Token = UUID.fromString("1275BB9A-14B2-4A96-9673-B0AF0463D474");
 
 
     public static List<String> SystemFactories = null; // 分厂
     public static String Announcement = ""; // 公告
-    public static NetSimplifyClient Net_simplify_client = new NetSimplifyClient(ServerIp, PortSecondary, Token);
+    public static NetSimplifyClient Net_simplify_client = new NetSimplifyClient(ServerIp, PortSecondary,Token);
     public static UserAccount UserAccount = null;
 }

AndroidTemplate/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         
 
         // NOTE: Do not place your application dependencies here; they belong

AndroidTemplate/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Oct 29 15:00:29 CST 2017
+#Sun Jul 29 09:58:11 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.3-rc-4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

ClientsLibrary/AccountSupport/FormAccountDetails.Designer.cs

@@ -128,6 +128,7 @@
             // 
             // textBox_LoginFailedCount
             // 
+            this.textBox_LoginFailedCount.BackColor = System.Drawing.Color.White;
             this.textBox_LoginFailedCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_LoginFailedCount.Location = new System.Drawing.Point(153, 459);
             this.textBox_LoginFailedCount.Name = "textBox_LoginFailedCount";
@@ -146,6 +147,7 @@
             // 
             // textBox_LastLoginWay
             // 
+            this.textBox_LastLoginWay.BackColor = System.Drawing.Color.White;
             this.textBox_LastLoginWay.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_LastLoginWay.Location = new System.Drawing.Point(153, 428);
             this.textBox_LastLoginWay.Name = "textBox_LastLoginWay";
@@ -164,6 +166,7 @@
             // 
             // textBox_LastLoginIpAddress
             // 
+            this.textBox_LastLoginIpAddress.BackColor = System.Drawing.Color.White;
             this.textBox_LastLoginIpAddress.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_LastLoginIpAddress.Location = new System.Drawing.Point(153, 398);
             this.textBox_LastLoginIpAddress.Name = "textBox_LastLoginIpAddress";
@@ -182,6 +185,7 @@
             // 
             // textBox_LastLoginTime
             // 
+            this.textBox_LastLoginTime.BackColor = System.Drawing.Color.White;
             this.textBox_LastLoginTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_LastLoginTime.Location = new System.Drawing.Point(153, 368);
             this.textBox_LastLoginTime.Name = "textBox_LastLoginTime";
@@ -200,6 +204,7 @@
             // 
             // textBox_LoginFrequency
             // 
+            this.textBox_LoginFrequency.BackColor = System.Drawing.Color.White;
             this.textBox_LoginFrequency.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_LoginFrequency.Location = new System.Drawing.Point(153, 338);
             this.textBox_LoginFrequency.Name = "textBox_LoginFrequency";
@@ -218,6 +223,7 @@
             // 
             // textBox_LoginEnable
             // 
+            this.textBox_LoginEnable.BackColor = System.Drawing.Color.White;
             this.textBox_LoginEnable.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_LoginEnable.Location = new System.Drawing.Point(153, 308);
             this.textBox_LoginEnable.Name = "textBox_LoginEnable";
@@ -236,6 +242,7 @@
             // 
             // textBox_RegisterTime
             // 
+            this.textBox_RegisterTime.BackColor = System.Drawing.Color.White;
             this.textBox_RegisterTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_RegisterTime.Location = new System.Drawing.Point(153, 279);
             this.textBox_RegisterTime.Name = "textBox_RegisterTime";
@@ -254,6 +261,7 @@
             // 
             // textBox_GradeDescription
             // 
+            this.textBox_GradeDescription.BackColor = System.Drawing.Color.White;
             this.textBox_GradeDescription.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_GradeDescription.Location = new System.Drawing.Point(153, 251);
             this.textBox_GradeDescription.Name = "textBox_GradeDescription";
@@ -272,6 +280,7 @@
             // 
             // textBox_Factory
             // 
+            this.textBox_Factory.BackColor = System.Drawing.Color.White;
             this.textBox_Factory.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_Factory.Location = new System.Drawing.Point(153, 223);
             this.textBox_Factory.Name = "textBox_Factory";
@@ -290,6 +299,7 @@
             // 
             // textBox_NameAlias
             // 
+            this.textBox_NameAlias.BackColor = System.Drawing.Color.White;
             this.textBox_NameAlias.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_NameAlias.Location = new System.Drawing.Point(153, 194);
             this.textBox_NameAlias.Name = "textBox_NameAlias";
@@ -308,6 +318,7 @@
             // 
             // textBox_UserName
             // 
+            this.textBox_UserName.BackColor = System.Drawing.Color.White;
             this.textBox_UserName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_UserName.Location = new System.Drawing.Point(153, 164);
             this.textBox_UserName.Name = "textBox_UserName";
@@ -348,6 +359,7 @@
             // textBox_file_uploadTime
             // 
             this.textBox_file_uploadTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.textBox_file_uploadTime.BackColor = System.Drawing.Color.White;
             this.textBox_file_uploadTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_file_uploadTime.Location = new System.Drawing.Point(252, 432);
             this.textBox_file_uploadTime.Name = "textBox_file_uploadTime";
@@ -368,6 +380,7 @@
             // textBox_file_size
             // 
             this.textBox_file_size.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.textBox_file_size.BackColor = System.Drawing.Color.White;
             this.textBox_file_size.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_file_size.Location = new System.Drawing.Point(66, 432);
             this.textBox_file_size.Name = "textBox_file_size";
@@ -389,6 +402,7 @@
             // 
             this.textBox_file_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBox_file_name.BackColor = System.Drawing.Color.White;
             this.textBox_file_name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.textBox_file_name.Location = new System.Drawing.Point(66, 405);
             this.textBox_file_name.Name = "textBox_file_name";
@@ -474,6 +488,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(706, 516);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);

ClientsLibrary/AccountSupport/FormAccountSelect.Designer.cs

@@ -118,6 +118,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(721, 480);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.userButton_login);

ClientsLibrary/AccountSupport/FormInputNewRole.Designer.cs

@@ -104,6 +104,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(445, 142);
             this.Controls.Add(this.userButton_login);
             this.Controls.Add(this.textBox3);

ClientsLibrary/AccountSupport/FormRegisterAccount.Designer.cs

@@ -219,6 +219,7 @@ namespace ClientsLibrary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(382, 394);
             this.Controls.Add(this.textBox6);
             this.Controls.Add(this.label9);

ClientsLibrary/BasicSupport/FormDownloading.Designer.cs

@@ -44,6 +44,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(300, 56);
             this.Controls.Add(this.label1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));

ClientsLibrary/BasicSupport/FormGetInputString.Designer.cs

@@ -67,6 +67,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(434, 133);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.userButton_login);

ClientsLibrary/BasicSupport/FormShowMachineId.Designer.cs

@@ -60,6 +60,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(356, 105);
             this.Controls.Add(this.userButton_login);
             this.Controls.Add(this.textBox1);

ClientsLibrary/BasicSupport/NetClientItem.Designer.cs

@@ -36,31 +36,34 @@
             // pictureBox1
             // 
             this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pictureBox1.Location = new System.Drawing.Point(4, 1);
+            this.pictureBox1.Location = new System.Drawing.Point(4, 3);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(34, 34);
+            this.pictureBox1.Size = new System.Drawing.Size(32, 32);
             this.pictureBox1.TabIndex = 0;
             this.pictureBox1.TabStop = false;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(45, 4);
+            this.label1.Location = new System.Drawing.Point(43, 3);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
+            this.label1.Size = new System.Drawing.Size(43, 17);
             this.label1.TabIndex = 1;
             this.label1.Text = "label1";
             // 
             // NetClientItem
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.BackColor = System.Drawing.Color.Lavender;
             this.Controls.Add(this.label1);
             this.Controls.Add(this.pictureBox1);
-            this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            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 = "NetClientItem";
-            this.Size = new System.Drawing.Size(185, 36);
+            this.Size = new System.Drawing.Size(186, 40);
+            this.Load += new System.EventHandler(this.NetClientItem_Load);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.NetClientItem_Paint);
             this.MouseEnter += new System.EventHandler(this.NetClientItem_MouseEnter);
             this.MouseLeave += new System.EventHandler(this.NetClientItem_MouseLeave);

ClientsLibrary/BasicSupport/NetClientItem.cs

@@ -25,8 +25,10 @@ namespace ClientsLibrary.BasicSupport
                 // 绘制角色名称
                 if (m_NetAccount.Roles?.Length > 0)
                 {
+                    e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+                    e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
                     int m_x = 45;
-                    int m_y = 20;
+                    int m_y = 22;
 
                     for (int i = 0; i < m_NetAccount.Roles.Length; i++)
                     {
@@ -100,6 +102,9 @@ namespace ClientsLibrary.BasicSupport
         {
         }
 
+        private void NetClientItem_Load( object sender, EventArgs e )
+        {
 
+        }
     }
 }

ClientsLibrary/BasicSupport/NetClientOnline.Designer.cs

@@ -71,6 +71,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);

ClientsLibrary/ClientsLibrary.csproj

@@ -33,11 +33,11 @@
     <Reference Include="CommonLibrary">
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.7.3.0, Culture=neutral, PublicKeyToken=cdb2261fa039ed67, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.7.3\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

ClientsLibrary/Configuration/ClientConfiguration.Designer.cs

@@ -143,6 +143,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.userButton3);
             this.Controls.Add(this.userButton2);
             this.Controls.Add(this.userButton1);

ClientsLibrary/Configuration/FormConfiguration.Designer.cs

@@ -62,6 +62,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(866, 593);
             this.Controls.Add(this.treeView1);
             this.Controls.Add(this.panel1);

ClientsLibrary/Configuration/GeneralConfiguration.Designer.cs

@@ -87,6 +87,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.userButton2);
             this.Controls.Add(this.panel1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));

ClientsLibrary/Configuration/ListConfiguration.Designer.cs

@@ -109,6 +109,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.userButton_save);
             this.Controls.Add(this.userButton_delete);
             this.Controls.Add(this.userButton_add);

ClientsLibrary/Configuration/RolesConfiguration.Designer.cs

@@ -237,6 +237,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.userButton5);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.userButton4);

ClientsLibrary/FileSupport/FileItemShow.Designer.cs

@@ -156,6 +156,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.label_download_times);
             this.Controls.Add(this.label_upload_name);
             this.Controls.Add(this.progressBar1);

ClientsLibrary/FileSupport/FileOperateControl.designer.cs

@@ -130,6 +130,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.Controls.Add(this.label_filesize);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.button1);

ClientsLibrary/FileSupport/FormFileOperate.Designer.cs

@@ -89,6 +89,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(531, 432);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.label_finish);

ClientsLibrary/FileSupport/FormSimplyFileUpload.designer.cs

@@ -59,6 +59,7 @@
             // 
             // statusStrip1
             // 
+            this.statusStrip1.BackColor = System.Drawing.Color.Transparent;
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabel1,
             this.toolStripStatusLabel2});
@@ -185,6 +186,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(563, 331);
             this.Controls.Add(this.userButton2);
             this.Controls.Add(this.userButton1);

ClientsLibrary/LogsSupport/FormLogView.Designer.cs

@@ -301,6 +301,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(1023, 713);
             this.Controls.Add(this.logNetAnalysisControl1);
             this.Controls.Add(this.userButton15);

ClientsLibrary/SoftUpdateSupport/FormUpdateLog.designer.cs

@@ -91,6 +91,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(651, 448);
             this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.listBox1);

ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.Designer.cs

@@ -31,10 +31,10 @@ namespace ClientsLibrary
         private void InitializeComponent()
         {
             this.label1 = new System.Windows.Forms.Label();
-            this.userButton_file = new UserButton();
+            this.userButton_file = new HslCommunication.Controls.UserButton();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
-            this.userButton_version = new UserButton();
+            this.userButton_version = new HslCommunication.Controls.UserButton();
             this.SuspendLayout();
             // 
             // label1
@@ -96,6 +96,7 @@ namespace ClientsLibrary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(569, 311);
             this.Controls.Add(this.userButton_version);
             this.Controls.Add(this.label2);

ClientsLibrary/UserClient.cs

@@ -44,7 +44,7 @@ namespace ClientsLibrary
         /// 服务器的IP地址，默认为127.0.0.1，可用于单机调试，
         /// 云服务器端：117.48.203.204，注意，云端为最新版，客户端版本比较旧会调试失败
         /// </summary>
-        public static string ServerIp { get; } = "117.48.203.204"; // 用于测试的云服务器地址
+        public static string ServerIp { get; } = "127.0.0.1"; // 用于测试的云服务器地址
 
 
         /// <summary>

ClientsLibrary/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

ClientsLibrary/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
+  <package id="HslCommunication" version="5.7.3" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net35" />
 </packages>

CommonLibrary/AccountSupport/FormAccountManage.designer.cs

@@ -32,8 +32,8 @@ namespace CommonLibrary
         {
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
-            this.userButton2 = new UserButton();
-            this.userButton1 = new UserButton();
+            this.userButton2 = new HslCommunication.Controls.UserButton();
+            this.userButton1 = new HslCommunication.Controls.UserButton();
             this.SuspendLayout();
             // 
             // textBox1
@@ -91,6 +91,7 @@ namespace CommonLibrary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(564, 471);
             this.Controls.Add(this.userButton2);
             this.Controls.Add(this.userButton1);

CommonLibrary/AccountSupport/FormMaintenance.designer.cs

@@ -30,11 +30,11 @@ namespace CommonLibrary
         /// </summary>
         private void InitializeComponent()
         {
-            this.userButton1 = new UserButton();
-            this.userButton2 = new UserButton();
+            this.userButton1 = new HslCommunication.Controls.UserButton();
+            this.userButton2 = new HslCommunication.Controls.UserButton();
             this.label1 = new System.Windows.Forms.Label();
             this.textBox1 = new System.Windows.Forms.TextBox();
-            this.userButton3 = new UserButton();
+            this.userButton3 = new HslCommunication.Controls.UserButton();
             this.SuspendLayout();
             // 
             // userButton1
@@ -100,6 +100,7 @@ namespace CommonLibrary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(435, 209);
             this.Controls.Add(this.userButton3);
             this.Controls.Add(this.textBox1);

CommonLibrary/AccountSupport/FormPasswordModify.designer.cs

@@ -33,10 +33,10 @@ namespace CommonLibrary
             this.components = new System.ComponentModel.Container();
             this.label1 = new System.Windows.Forms.Label();
             this.textBox1 = new System.Windows.Forms.TextBox();
-            this.userButton1 = new UserButton();
+            this.userButton1 = new HslCommunication.Controls.UserButton();
             this.panel1 = new System.Windows.Forms.Panel();
             this.label4 = new System.Windows.Forms.Label();
-            this.userButton2 = new UserButton();
+            this.userButton2 = new HslCommunication.Controls.UserButton();
             this.textBox3 = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
             this.textBox2 = new System.Windows.Forms.TextBox();
@@ -157,6 +157,7 @@ namespace CommonLibrary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(396, 407);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.userButton1);

CommonLibrary/AccountSupport/NetAccount.cs

@@ -10,33 +10,97 @@ namespace CommonLibrary
     /// </summary>
     public class NetAccount
     {
+
+        #region Constructor
+
+        /// <summary>
+        /// 实例化一个默认的构造函数
+        /// </summary>
+        public NetAccount( )
+        {
+            LoginTime = DateTime.Now;
+        }
+
+        #endregion
+
+        #region Public Properties
+
+
         /// <summary>
         /// 唯一的用户名
         /// </summary>
         public string UserName { get; set; }
+
         /// <summary>
         /// 别名
         /// </summary>
         public string Alias { get; set; }
+
         /// <summary>
         /// ip地址
         /// </summary>
         public string IpAddress { get; set; }
+
         /// <summary>
         /// 工厂或是部分分类
         /// </summary>
         public string Factory { get; set; }
+
         /// <summary>
         /// 登陆时间
         /// </summary>
         public DateTime LoginTime { get; set; }
+
         /// <summary>
         /// 包含的角色名称
         /// </summary>
         public string[] Roles { get; set; }
+
         /// <summary>
         /// 本地连接唯一的身份标识
         /// </summary>
         public string UniqueId { get; set; }
+
+        #endregion
+
+        #region Public Method
+
+        /// <summary>
+        /// 获取当前客户端的在线时间的文本描述方式
+        /// </summary>
+        /// <returns></returns>
+        public string GetOnlineTime( )
+        {
+            TimeSpan timeSpan = DateTime.Now - LoginTime;
+            if (timeSpan.TotalSeconds < 60)
+            {
+                return timeSpan.Seconds.ToString( );
+            }
+            else if (timeSpan.TotalMinutes < 60)
+            {
+                return timeSpan.Minutes + " : " + timeSpan.Seconds;
+            }
+            else if (timeSpan.TotalHours < 24)
+            {
+                return timeSpan.Hours + " : " + timeSpan.Minutes + " : " + timeSpan.Seconds;
+            }
+            else
+            {
+                return timeSpan.Days + " D " + timeSpan.Hours + " : " + timeSpan.Minutes + " : ";
+            }
+        }
+
+        #endregion
+
+        #region Object Override
+
+        /// <summary>
+        /// 返回表示当前对象的字符串
+        /// </summary>
+        /// <returns>字符串</returns>
+        public override string ToString( ) => $"{IpAddress} [ {(string.IsNullOrEmpty( Alias ) ? UserName : Alias)} ] [ {GetOnlineTime( )} ]";
+
+        #endregion
+
     }
 }

CommonLibrary/BasicSupport/FormAbout.designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAbout));
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
@@ -93,7 +92,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(405, 159);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.label4);

CommonLibrary/BasicSupport/FormAbout.resx

@@ -117,178 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
-        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
-        AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
-        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////8AD/////////////////
-        //AA/3d3d3d3d3d3d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d//////////////3f/AA/3f/////////
-        ////93/wAP93//////d3d3d3f/d/8AD/d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93////
-        //d3d3d3f/d/8AD/d//////////////3f/AA/3f/////////////93/wAP93//////d3d3d3f/d/8AD/
-        d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93//////d3d3d3f/d/8AD/d//////////////3
-        f/AA/3f/////////////93/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA/3d3d3d3d3d3
-        d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA///////////////////wAP//////
-        ////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
-        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAP//
-        ////////93d3d3d3d3/3////////f/f///d3d39/9/d39///f3/3///3d3d/f/f///////9/9///93d3
-        f3/393f3//9/f/f///d3d39/9////////3/3d3d3d3d3f/d3d3d3d3d/93d3d3d3d3//////////////
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgDx7/AA9vb2AAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD
-        AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwAAAAMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAAAA
-        AwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgICAgICAgICAgICAgIC
-        AgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEBAQEBAQIBAgICAgIC
-        AgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEBAgICAgICAgICAQEB
-        AQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgIC
-        AgICAgICAgICAgICAgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEB
-        AQEBAQIBAgICAgICAgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEB
-        AgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAA
-        AwMBAQICAgICAgICAgICAgICAgICAgICAgEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQMDAAAAAwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEDAwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAQEBAQMDAAAAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAADAwMDAwMDAwMDAwMDAwMD
-        AwMDAwMDAwMDAwMDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-        ////////wAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAf///////////////ygA
-        AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAQkJCAPHv8AD29vYAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAMD
-        AwMDAwMDAwMDAwMDAwMDAQEBAQEBAQEBAQEBAQEDAwECAgICAgICAgICAgIBAwMBAgICAgIBAQEBAQEC
-        AQMDAQIBAQECAQICAgIBAgEDAwECAgICAgEBAQEBAQIBAwMBAgICAgICAgICAgICAQMDAQICAgICAQEB
-        AQEBAgEDAwECAQEBAgECAgICAQIBAwMBAgICAgIBAQEBAQECAQMDAQICAgICAgICAgICAgEDAwEBAQEB
-        AQEBAQEBAQEBAwMBAQEBAQEBAQEBAQEBAQMDAQEBAQEBAQEBAQEBAQEDAwMDAwMDAwMDAwMDAwMDA///
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JC
-        Qv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb2
-        9v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA
-        AAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b2
-        9v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv8P/x7/D/QkJC/0JC
-        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv
-        8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
-        9v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b2
-        9v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/29vb/9vb2/0JCQv/x7/D/QkJC/0JCQv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P9CQkL/9vb2//b29v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC//Hv8P9CQkL/9vb2//b29v9CQkL/8e/w/0JCQv9CQkL/QkJC//Hv8P9CQkL/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v///wAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-</value>
-  </data>
 </root>

CommonLibrary/BasicSupport/FormAboutVersion.designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAboutVersion));
             this.label7 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
@@ -115,7 +114,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(438, 190);
             this.Controls.Add(this.label7);
             this.Controls.Add(this.label6);

CommonLibrary/BasicSupport/FormAboutVersion.resx

@@ -117,178 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
-        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
-        AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
-        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////8AD/////////////////
-        //AA/3d3d3d3d3d3d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d//////////////3f/AA/3f/////////
-        ////93/wAP93//////d3d3d3f/d/8AD/d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93////
-        //d3d3d3f/d/8AD/d//////////////3f/AA/3f/////////////93/wAP93//////d3d3d3f/d/8AD/
-        d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93//////d3d3d3f/d/8AD/d//////////////3
-        f/AA/3f/////////////93/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA/3d3d3d3d3d3
-        d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA///////////////////wAP//////
-        ////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
-        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAP//
-        ////////93d3d3d3d3/3////////f/f///d3d39/9/d39///f3/3///3d3d/f/f///////9/9///93d3
-        f3/393f3//9/f/f///d3d39/9////////3/3d3d3d3d3f/d3d3d3d3d/93d3d3d3d3//////////////
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgDx7/AA9vb2AAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD
-        AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwAAAAMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAAAA
-        AwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgICAgICAgICAgICAgIC
-        AgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEBAQEBAQIBAgICAgIC
-        AgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEBAgICAgICAgICAQEB
-        AQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgIC
-        AgICAgICAgICAgICAgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEB
-        AQEBAQIBAgICAgICAgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEB
-        AgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAA
-        AwMBAQICAgICAgICAgICAgICAgICAgICAgEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQMDAAAAAwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEDAwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAQEBAQMDAAAAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAADAwMDAwMDAwMDAwMDAwMD
-        AwMDAwMDAwMDAwMDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-        ////////wAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAf///////////////ygA
-        AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAQkJCAPHv8AD29vYAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAMD
-        AwMDAwMDAwMDAwMDAwMDAQEBAQEBAQEBAQEBAQEDAwECAgICAgICAgICAgIBAwMBAgICAgIBAQEBAQEC
-        AQMDAQIBAQECAQICAgIBAgEDAwECAgICAgEBAQEBAQIBAwMBAgICAgICAgICAgICAQMDAQICAgICAQEB
-        AQEBAgEDAwECAQEBAgECAgICAQIBAwMBAgICAgIBAQEBAQECAQMDAQICAgICAgICAgICAgEDAwEBAQEB
-        AQEBAQEBAQEBAwMBAQEBAQEBAQEBAQEBAQMDAQEBAQEBAQEBAQEBAQEDAwMDAwMDAwMDAwMDAwMDA///
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JC
-        Qv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb2
-        9v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA
-        AAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b2
-        9v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv8P/x7/D/QkJC/0JC
-        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv
-        8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
-        9v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b2
-        9v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/29vb/9vb2/0JCQv/x7/D/QkJC/0JCQv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P9CQkL/9vb2//b29v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC//Hv8P9CQkL/9vb2//b29v9CQkL/8e/w/0JCQv9CQkL/QkJC//Hv8P9CQkL/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v///wAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-</value>
-  </data>
 </root>

CommonLibrary/BasicSupport/FormInputAndAction.designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormInputAndAction));
             this.label1 = new System.Windows.Forms.Label();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
@@ -94,6 +93,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(531, 280);
             this.Controls.Add(this.userButton1);
             this.Controls.Add(this.label3);

CommonLibrary/BasicSupport/FormInputAndAction.resx

@@ -117,178 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
-        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
-        AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
-        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////8AD/////////////////
-        //AA/3d3d3d3d3d3d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d//////////////3f/AA/3f/////////
-        ////93/wAP93//////d3d3d3f/d/8AD/d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93////
-        //d3d3d3f/d/8AD/d//////////////3f/AA/3f/////////////93/wAP93//////d3d3d3f/d/8AD/
-        d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93//////d3d3d3f/d/8AD/d//////////////3
-        f/AA/3f/////////////93/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA/3d3d3d3d3d3
-        d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA///////////////////wAP//////
-        ////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
-        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAP//
-        ////////93d3d3d3d3/3////////f/f///d3d39/9/d39///f3/3///3d3d/f/f///////9/9///93d3
-        f3/393f3//9/f/f///d3d39/9////////3/3d3d3d3d3f/d3d3d3d3d/93d3d3d3d3//////////////
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgDx7/AA9vb2AAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD
-        AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwAAAAMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAAAA
-        AwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgICAgICAgICAgICAgIC
-        AgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEBAQEBAQIBAgICAgIC
-        AgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEBAgICAgICAgICAQEB
-        AQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgIC
-        AgICAgICAgICAgICAgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEB
-        AQEBAQIBAgICAgICAgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEB
-        AgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAA
-        AwMBAQICAgICAgICAgICAgICAgICAgICAgEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQMDAAAAAwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEDAwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAQEBAQMDAAAAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAADAwMDAwMDAwMDAwMDAwMD
-        AwMDAwMDAwMDAwMDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-        ////////wAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAf///////////////ygA
-        AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAQkJCAPHv8AD29vYAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAMD
-        AwMDAwMDAwMDAwMDAwMDAQEBAQEBAQEBAQEBAQEDAwECAgICAgICAgICAgIBAwMBAgICAgIBAQEBAQEC
-        AQMDAQIBAQECAQICAgIBAgEDAwECAgICAgEBAQEBAQIBAwMBAgICAgICAgICAgICAQMDAQICAgICAQEB
-        AQEBAgEDAwECAQEBAgECAgICAQIBAwMBAgICAgIBAQEBAQECAQMDAQICAgICAgICAgICAgEDAwEBAQEB
-        AQEBAQEBAQEBAwMBAQEBAQEBAQEBAQEBAQMDAQEBAQEBAQEBAQEBAQEDAwMDAwMDAwMDAwMDAwMDA///
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JC
-        Qv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb2
-        9v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA
-        AAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b2
-        9v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv8P/x7/D/QkJC/0JC
-        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv
-        8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
-        9v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b2
-        9v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/29vb/9vb2/0JCQv/x7/D/QkJC/0JCQv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P9CQkL/9vb2//b29v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC//Hv8P9CQkL/9vb2//b29v9CQkL/8e/w/0JCQv9CQkL/QkJC//Hv8P9CQkL/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v///wAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-</value>
-  </data>
 </root>

CommonLibrary/BasicSupport/FormMatterRemind.designer.cs

@@ -40,10 +40,11 @@
             this.label1.TabIndex = 0;
             this.label1.Text = "label1";
             // 
-            // FormDownloading
+            // FormMatterRemind
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(300, 56);
             this.Controls.Add(this.label1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -51,7 +52,7 @@
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "FormDownloading";
+            this.Name = "FormMatterRemind";
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

CommonLibrary/BasicSupport/FormPasswordCheck.designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormPasswordCheck));
             this.userButton1 = new HslCommunication.Controls.UserButton();
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
@@ -61,6 +60,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(407, 109);
             this.Controls.Add(this.userButton1);
             this.Controls.Add(this.textBox2);

CommonLibrary/BasicSupport/FormPasswordCheck.resx

@@ -117,178 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAYAICAQAAEABADoAgAAZgAAABAQEAABAAQAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
-        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
-        AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
-        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////8AD/////////////////
-        //AA/3d3d3d3d3d3d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d//////////////3f/AA/3f/////////
-        ////93/wAP93//////d3d3d3f/d/8AD/d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93////
-        //d3d3d3f/d/8AD/d//////////////3f/AA/3f/////////////93/wAP93//////d3d3d3f/d/8AD/
-        d/93d3f3/////3/3f/AA/3f/d3d39/////9/93/wAP93//////d3d3d3f/d/8AD/d//////////////3
-        f/AA/3f/////////////93/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA/3d3d3d3d3d3
-        d3d3d3/wAP93d3d3d3d3d3d3d3d/8AD/d3d3d3d3d3d3d3d3f/AA///////////////////wAP//////
-        ////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
-        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAP//
-        ////////93d3d3d3d3/3////////f/f///d3d39/9/d39///f3/3///3d3d/f/f///////9/9///93d3
-        f3/393f3//9/f/f///d3d39/9////////3/3d3d3d3d3f/d3d3d3d3d/93d3d3d3d3//////////////
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABAAgAAAAAAAAEAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgDx7/AA9vb2AAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD
-        AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwAAAAMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAAAA
-        AwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgICAgICAgICAgICAgIC
-        AgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEBAQEBAQIBAgICAgIC
-        AgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEBAgICAgICAgICAQEB
-        AQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAAAwMBAQICAgICAgIC
-        AgICAgICAgICAgICAgEBAwMAAAADAwEBAgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgEB
-        AQEBAQIBAgICAgICAgIBAgIBAQMDAAAAAwMBAQICAQEBAQEBAgECAgICAgICAgECAgEBAwMAAAADAwEB
-        AgICAgICAgICAQEBAQEBAQEBAQICAQEDAwAAAAMDAQECAgICAgICAgICAgICAgICAgICAgIBAQMDAAAA
-        AwMBAQICAgICAgICAgICAgICAgICAgICAgEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQED
-        AwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQMDAAAAAwMBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAwMAAAADAwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEDAwAAAAMDAQEBAQEBAQEBAQEBAQEBAQEB
-        AQEBAQEBAQMDAAAAAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAADAwMDAwMDAwMDAwMDAwMD
-        AwMDAwMDAwMDAwMDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-        ////////wAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAf///////////////ygA
-        AAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAQkJCAPHv8AD29vYAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAMD
-        AwMDAwMDAwMDAwMDAwMDAQEBAQEBAQEBAQEBAQEDAwECAgICAgICAgICAgIBAwMBAgICAgIBAQEBAQEC
-        AQMDAQIBAQECAQICAgIBAgEDAwECAgICAgEBAQEBAQIBAwMBAgICAgICAgICAgICAQMDAQICAgICAQEB
-        AQEBAgEDAwECAQEBAgECAgICAQIBAwMBAgICAgIBAQEBAQECAQMDAQICAgICAgICAgICAgEDAwEBAQEB
-        AQEBAQEBAQEBAwMBAQEBAQEBAQEBAQEBAQMDAQEBAQEBAQEBAQEBAQEDAwMDAwMDAwMDAwMDAwMDA///
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JC
-        Qv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb2
-        9v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC//b29v/29vb/AAAAAAAA
-        AAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv/x7/D/8e/w/0JCQv9CQkL/9vb2//b2
-        9v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv8P/x7/D/QkJC/0JC
-        Qv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w//Hv
-        8P9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAA9vb2//b2
-        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA
-        AAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA
-        AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
-        9v/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-        ///////////////////AAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAA
-        AAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB////////
-        ////////KAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
-        9v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC//b2
-        9v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JC
-        Qv/29vb/9vb2/0JCQv/x7/D/QkJC/0JCQv9CQkL/8e/w/0JCQv/x7/D/8e/w//Hv8P/x7/D/QkJC//Hv
-        8P9CQkL/9vb2//b29v9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC//Hv8P9CQkL/9vb2//b29v9CQkL/8e/w/0JCQv9CQkL/QkJC//Hv8P9CQkL/8e/w//Hv
-        8P/x7/D/8e/w/0JCQv/x7/D/QkJC//b29v/29vb/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/8e/w/0JCQv/29vb/9vb2/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv
-        8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
-        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
-        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v///wAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-</value>
-  </data>
 </root>

CommonLibrary/BasicSupport/FormVersionControl.designer.cs

@@ -88,6 +88,7 @@ namespace CommonLibrary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.AliceBlue;
             this.ClientSize = new System.Drawing.Size(397, 158);
             this.Controls.Add(this.userButton1);
             this.Controls.Add(this.textBox2);

CommonLibrary/CommonLibrary.csproj

@@ -30,11 +30,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.7.3.0, Culture=neutral, PublicKeyToken=cdb2261fa039ed67, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.7.3\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -166,6 +166,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

CommonLibrary/DataBaseSupport/SqlServerSupport.cs

@@ -10,6 +10,19 @@ namespace CommonLibrary.DataBaseSupport
     /// </summary>
     public class SqlServerSupport
     {
+        #region Constructor
+
+        /// <summary>
+        /// 实例化一个默认的构造函数
+        /// </summary>
+        public SqlServerSupport( )
+        {
+
+        }
+
+        #endregion
+
+
         /// <summary>
         /// 数据库的连接字符串，该信息应来源于服务器保存的连接字符串
         /// </summary>

CommonLibrary/UserSystem.cs

@@ -40,11 +40,12 @@ namespace CommonLibrary
              *    时间：2017年10月1日 16:00:13      版本号：1.5.0
              *    时间：2017年10月6日 19:23:09      版本号：1.6.0
              *    时间：2017年10月21日 11:55:41     版本号：1.7.0
+             *    时间：2018年5月8日 11:09:16       版本号：1.8.0
              * 
              **************************************************************************/
 
 
-            SoftBasic.FrameworkVersion = new SystemVersion("1.7.14");
+            SoftBasic.FrameworkVersion = new SystemVersion("1.8.0");
 
         }
 
@@ -53,6 +54,7 @@ namespace CommonLibrary
         /************************************************************************************************
          * 
          *    注意：您在准备二次开发时，应该重新生成一个自己的GUID码
+         *    Note: When you are preparing for secondary development, you should regenerate your own GUID code
          * 
          ************************************************************************************************/
 
@@ -77,27 +79,36 @@ namespace CommonLibrary
         /// 主网络端口，此处随机定义了一个数据
         /// </summary>
         public static int Port_Main_Net { get; } = 17652;
+
         /// <summary>
         /// 同步网络访问的端口，此处随机定义了一个数据
         /// </summary>
         public static int Port_Second_Net { get; } = 14568;
+
         /// <summary>
         /// 用于软件系统更新的端口，此处随机定义了一个数据
         /// </summary>
         public static int Port_Update_Net { get; } = 17538;
+
         /// <summary>
         /// 共享文件的端口号
         /// </summary>
         public static int Port_Ultimate_File_Server { get; } = 34261;
+
         /// <summary>
         /// 用于UDP传输的端口号
         /// </summary>
         public static int Port_Udp_Server { get; } = 32566;
+
         /// <summary>
         /// 用于服务器版本更新的端口
         /// </summary>
         public static int Port_Advanced_File_Server { get; } = 24672;
 
+        /// <summary>
+        /// 用于实时数据推送的消息网络
+        /// </summary>
+        public static int Port_Push_Server { get; } = 14574;
 
 
         /// <summary>

CommonLibrary/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

CommonLibrary/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
+  <package id="HslCommunication" version="5.7.3" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net35" />
 </packages>

HslCommunicationNetTestTool/Form1.cs

@@ -46,11 +46,11 @@ namespace HslCommunicationNetTestTool
                     string name = $"{m.IpAddress} [{m.IpPort}]";
                     TreeNode node = new TreeNode(name);
                     node.Tag = new HslCommunication.Enthernet.NetSimplifyClient(
-                        new System.Net.IPEndPoint(System.Net.IPAddress.Parse(m.IpAddress),
-                        int.Parse(m.IpPort)))
+                        m.IpAddress,
+                        int.Parse(m.IpPort))
                     {
-                        ConnectTimeout = int.Parse(m.TimeOut),
-                        KeyToken = new Guid(m.Token),
+                        ConnectTimeOut = int.Parse(m.TimeOut),
+                        Token = new Guid(m.Token),
                     };
                     node.ToolTipText = m.Guid;
 

HslCommunicationNetTestTool/FormCreateClient.cs

@@ -27,10 +27,10 @@ namespace HslCommunicationNetTestTool
             try
             {
                 Client = new HslCommunication.Enthernet.NetSimplifyClient(
-                    new System.Net.IPEndPoint(System.Net.IPAddress.Parse(textBox1.Text), int.Parse(textBox2.Text)))
+                    textBox1.Text, int.Parse(textBox2.Text))
                 {
-                    KeyToken = new Guid(textBox3.Text),
-                    ConnectTimeout = int.Parse(textBox4.Text),
+                    Token = new Guid(textBox3.Text),
+                    ConnectTimeOut = int.Parse(textBox4.Text),
                 };
 
                 IpAddress = textBox1.Text;

HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj

@@ -31,11 +31,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.7.3.0, Culture=neutral, PublicKeyToken=cdb2261fa039ed67, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.7.3\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

HslCommunicationNetTestTool/app.config

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="HslCommunicationNetTestTool.Settings1" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
@@ -12,4 +12,12 @@
             </setting>
         </HslCommunicationNetTestTool.Settings1>
     </userSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

HslCommunicationNetTestTool/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="5.0.4" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
+  <package id="HslCommunication" version="5.7.3" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net35" />
 </packages>

README.md

@@ -1,13 +1,32 @@
 # C-S架构的服务器客户端模版
 
 [![Visual Studio](https://img.shields.io/badge/Visual%20Studio-2017-red.svg)](https://www.visualstudio.com/zh-hans/) [![Language](https://img.shields.io/badge/Language-C%23%207.0-orange.svg)](https://blogs.msdn.microsoft.com/dotnet/2016/08/24/whats-new-in-csharp-7-0/) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/dathlin/ClientServerProject/blob/master/LICENSE)
-[![Android Studio](https://img.shields.io/badge/Android%20Studio-2.3-green.svg)](https://www.visualstudio.com/zh-hans/)
+[![Android Studio](https://img.shields.io/badge/Android%20Studio-3.1-green.svg)](https://www.visualstudio.com/zh-hans/)
 
 ## Summary
-一个基于中小型提炼的C-S开发框架，覆盖电脑端，web端，手机端的全平台系统模版，在大多数的一对多的系统设计中会包含一些常用的重复的功能代码，比如网络通信机制，客户端版本控制，账户控制管理，密码修改，公告管理，服务器配置，各种常用窗口等等，而且大多数的中小型系统只是需要到简单的权限管理即可。
+一个基于中小型提炼的C-S开发框架，覆盖电脑端，web端，手机端的全平台系统模版，在大多数的一对多的系统设计中会包含一些常用的重复的功能代码，
+比如网络通信机制，客户端版本控制，账户控制管理，密码修改，公告管理，服务器配置，各种常用窗口等等，而且大多数的中小型系统只是需要到简单的权限管理即可。
 
 <br />
-本框架包含了四种客户端的模式，第一种常用的winform客户端，第二种为wpf客户端，第三种为asp.net mvc模式，第四种为安卓平台的客户端，也就是说你可以在winform和wpf客户端上选择一种模式，然后您的系统提供一些功能（诸如报表查看）到asp.net上去，然后提供一个手机端使用的Android App，如果服务器假设在云端，所有的人都可以随时随地的进行交互，数据流通，所有的账户模型都是统一的，浏览器还方便一些只需要查看报表用户的人员不需要在部署客户端了。当然，客户端可以提供更加强大的功能。
+本框架包含了四种客户端的模式，第一种常用的winform客户端，第二种为wpf客户端，第三种为asp.net mvc模式，
+第四种为安卓平台的客户端，也就是说你可以在winform和wpf客户端上选择一种模式，然后您的系统提供一些功能（诸如报表查看）到asp.net上去，
+然后提供一个手机端使用的Android App，如果服务器假设在云端，所有的人都可以随时随地的进行交互，数据流通，所有的账户模型都是统一的，
+浏览器还方便一些只需要查看报表用户的人员不需要在部署客户端了。当然，客户端可以提供更加强大的功能。
+
+
+A CS development framework based on small-to-medium sized refining, covering computer-side, web-side, and mobile-side full-platform system templates,
+will include some commonly used repetitive function codes, such as network communication mechanisms, 
+in most one-to-many system designs. Client version control, account control management, password modification, 
+announcement management, server configuration, various common windows, etc., and most small and medium-sized systems 
+just need simple rights management.
+
+
+ This framework contains four client-side modes, the first commonly used winform client, the second is the wpf client, 
+the third is the asp.net mvc mode, and the fourth is the client of the Android platform. You can choose a mode on winform and wpf clients, 
+then your system provides some functions (such as report viewing) to asp.net, and then provide an Android app for mobile phone use, 
+if the server is assumed in the cloud, all People can interact with anytime, anywhere, data flow, all account models are unified, 
+the browser is also convenient for some people who only need to view the report users do not need to deploy the client. Of course, 
+the client can provide more powerful features.
 
 
 ## Features included
@@ -96,13 +115,13 @@
 </ul>
 
 
-## HslCommunication.dll [![NuGet Status](https://img.shields.io/nuget/v/HslCommunication.svg)](https://www.nuget.org/packages/HslCommunication/)
+## HslCommunication.dll [![NuGet Status](https://img.shields.io/nuget/v/HslCommunication.svg)](https://www.nuget.org/packages/HslCommunication/) ![NuGet Download](https://img.shields.io/nuget/dt/HslCommunication.svg) 
 <p>本C-S项目的核心组件，该组件功能提供了一些基础功能类和整个C-S项目的网络支持，除此之外，该组件提供了访问三菱PLC，西门子PLC，欧姆龙PLC，Modbus的数据功能。
 关于这个库的项目介绍地址如下：</p>
 
 [http://www.cnblogs.com/dathlin/p/7703805.html](http://www.cnblogs.com/dathlin/p/7703805.html)
 
-在Nuget控制台输入下面的指令即可安装，或者使用VS2017的Nuget包管理器来方便的下载组件，如果不清楚怎么使用Nuget可以参考网上教程。
+在Nuget控制台输入下面的指令即可安装，或者使用VS2017的Nuget包管理器来方便的下载组件，如果不清楚怎么使用NuGet可以参考网上教程。
 
 关于该库的急速体验Demo程序下载地址：
 
@@ -304,6 +323,6 @@ Install-Package HslCommunication
 
 
 # License:
-###### Copyright (c) Richard.Hu. All rights reserved.
-###### Licensed under the MIT License.
-###### WeChat:工业智能软件开发项目组
+##### Copyright (c) Richard.Hu. All rights reserved.
+##### Licensed under the MIT License.
+##### WeChat:工业智能软件开发项目组

软件系统客户端Wpf/App.config

@@ -19,7 +19,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

软件系统客户端Wpf/MainWindow.xaml

@@ -82,11 +82,6 @@
                                 <materialDesign:PackIcon Kind="Rotate3d" />
                             </MenuItem.Icon>
                         </MenuItem>
-                        <MenuItem Header="开发中心" x:Name="MenuItem开发中心" Click="MenuItem开发中心_Click">
-                            <MenuItem.Icon>
-                                <materialDesign:PackIcon Kind="Security" />
-                            </MenuItem.Icon>
-                        </MenuItem>
                     </MenuItem>
                     <MenuItem Header="_设置">
                         <MenuItem.Icon>

软件系统客户端Wpf/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="5.0.4" targetFramework="net45" />
+  <package id="HslCommunication" version="5.7.3" targetFramework="net45" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net45" />
-  <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
+  <package id="MaterialDesignThemes" version="2.4.0.1044" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
 </packages>

软件系统客户端Wpf/软件系统客户端Wpf.csproj

@@ -40,17 +40,17 @@
     <Reference Include="CommonLibrary">
       <HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="HslCommunication, Version=5.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HslCommunication.5.0.4\lib\net35\HslCommunication.dll</HintPath>
+    <Reference Include="HslCommunication, Version=5.7.3.0, Culture=neutral, PublicKeyToken=cdb2261fa039ed67, processorArchitecture=MSIL">
+      <HintPath>..\packages\HslCommunication.5.7.3\lib\net35\HslCommunication.dll</HintPath>
     </Reference>
     <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.0.1044, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />