From e8da50fda82b60c84e4e3d4683a1d9f22f3b1abc Mon Sep 17 00:00:00 2001 From: dathlin Date: Mon, 2 Oct 2017 11:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8Cv1.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormRegisterAccount.Designer.cs | 1 - .../LogsSupport/FormLogView.Designer.cs | 41 +------------------ ClientsLibrary/LogsSupport/FormLogView.cs | 18 ++++---- .../ProtocolSupport/CommonProtocol.cs | 2 +- CommonLibrary/ProtocolSupport/CustomerCode.cs | 8 ++++ .../FormServerWindow.cs" | 2 +- 6 files changed, 21 insertions(+), 51 deletions(-) diff --git a/ClientsLibrary/AccountSupport/FormRegisterAccount.Designer.cs b/ClientsLibrary/AccountSupport/FormRegisterAccount.Designer.cs index 9cf21ae..d12305a 100644 --- a/ClientsLibrary/AccountSupport/FormRegisterAccount.Designer.cs +++ b/ClientsLibrary/AccountSupport/FormRegisterAccount.Designer.cs @@ -183,7 +183,6 @@ namespace ClientsLibrary this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MaximizeBox = false; this.Name = "FormRegisterAccount"; - this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "注册新账户"; diff --git a/ClientsLibrary/LogsSupport/FormLogView.Designer.cs b/ClientsLibrary/LogsSupport/FormLogView.Designer.cs index 36b6b27..3a81d3b 100644 --- a/ClientsLibrary/LogsSupport/FormLogView.Designer.cs +++ b/ClientsLibrary/LogsSupport/FormLogView.Designer.cs @@ -28,8 +28,6 @@ /// private void InitializeComponent() { - this.userButton16 = new HslCommunication.Controls.UserButton(); - this.userButton17 = new HslCommunication.Controls.UserButton(); this.userButton15 = new HslCommunication.Controls.UserButton(); this.userButton14 = new HslCommunication.Controls.UserButton(); this.userButton12 = new HslCommunication.Controls.UserButton(); @@ -49,36 +47,6 @@ this.logNetAnalysisControl1 = new HslCommunication.LogNet.LogNetAnalysisControl(); this.SuspendLayout(); // - // userButton16 - // - this.userButton16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.userButton16.BackColor = System.Drawing.Color.Transparent; - this.userButton16.CustomerInformation = ""; - this.userButton16.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); - this.userButton16.Font = new System.Drawing.Font("微软雅黑", 9F); - this.userButton16.Location = new System.Drawing.Point(905, 344); - this.userButton16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.userButton16.Name = "userButton16"; - this.userButton16.Size = new System.Drawing.Size(103, 26); - this.userButton16.TabIndex = 46; - this.userButton16.UIText = "文件日志清空"; - this.userButton16.Click += new System.EventHandler(this.userButton16_Click); - // - // userButton17 - // - this.userButton17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.userButton17.BackColor = System.Drawing.Color.Transparent; - this.userButton17.CustomerInformation = ""; - this.userButton17.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); - this.userButton17.Font = new System.Drawing.Font("微软雅黑", 9F); - this.userButton17.Location = new System.Drawing.Point(797, 344); - this.userButton17.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.userButton17.Name = "userButton17"; - this.userButton17.Size = new System.Drawing.Size(103, 26); - this.userButton17.TabIndex = 45; - this.userButton17.UIText = "文件日志查看"; - this.userButton17.Click += new System.EventHandler(this.userButton17_Click); - // // userButton15 // this.userButton15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -181,7 +149,7 @@ this.userButton8.Name = "userButton8"; this.userButton8.Size = new System.Drawing.Size(103, 26); this.userButton8.TabIndex = 38; - this.userButton8.UIText = "共享文件日志清空"; + this.userButton8.UIText = "文件日志清空"; this.userButton8.Click += new System.EventHandler(this.userButton8_Click); // // userButton9 @@ -196,7 +164,7 @@ this.userButton9.Name = "userButton9"; this.userButton9.Size = new System.Drawing.Size(103, 26); this.userButton9.TabIndex = 37; - this.userButton9.UIText = "共享文件日志查看"; + this.userButton9.UIText = "文件日志查看"; this.userButton9.Click += new System.EventHandler(this.userButton9_Click); // // userButton6 @@ -335,8 +303,6 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1023, 713); this.Controls.Add(this.logNetAnalysisControl1); - this.Controls.Add(this.userButton16); - this.Controls.Add(this.userButton17); this.Controls.Add(this.userButton15); this.Controls.Add(this.userButton14); this.Controls.Add(this.userButton12); @@ -363,9 +329,6 @@ } #endregion - - private HslCommunication.Controls.UserButton userButton16; - private HslCommunication.Controls.UserButton userButton17; private HslCommunication.Controls.UserButton userButton15; private HslCommunication.Controls.UserButton userButton14; private HslCommunication.Controls.UserButton userButton12; diff --git a/ClientsLibrary/LogsSupport/FormLogView.cs b/ClientsLibrary/LogsSupport/FormLogView.cs index acc7241..860689f 100644 --- a/ClientsLibrary/LogsSupport/FormLogView.cs +++ b/ClientsLibrary/LogsSupport/FormLogView.cs @@ -129,15 +129,15 @@ namespace ClientsLibrary { ClearFromServer(CommonHeadCode.SimplifyHeadCode.客户端日志清空); } - private void userButton17_Click(object sender, EventArgs e) - { - ReadFromServer(CommonHeadCode.SimplifyHeadCode.头像日志查看); - } - - private void userButton16_Click(object sender, EventArgs e) - { - ClearFromServer(CommonHeadCode.SimplifyHeadCode.头像日志清空); - } + //private void userButton17_Click(object sender, EventArgs e) + //{ + // ReadFromServer(CommonHeadCode.SimplifyHeadCode.头像日志查看); + //} + + //private void userButton16_Click(object sender, EventArgs e) + //{ + // ClearFromServer(CommonHeadCode.SimplifyHeadCode.头像日志清空); + //} private void logNetAnalysisControl1_Load(object sender, EventArgs e) { diff --git a/CommonLibrary/ProtocolSupport/CommonProtocol.cs b/CommonLibrary/ProtocolSupport/CommonProtocol.cs index 35f97f9..757a597 100644 --- a/CommonLibrary/ProtocolSupport/CommonProtocol.cs +++ b/CommonLibrary/ProtocolSupport/CommonProtocol.cs @@ -44,7 +44,7 @@ namespace CommonLibrary * **************************************************************************/ - SoftBasic.FrameworkVersion = new SystemVersion("1.5.2"); + SoftBasic.FrameworkVersion = new SystemVersion("1.5.3"); } diff --git a/CommonLibrary/ProtocolSupport/CustomerCode.cs b/CommonLibrary/ProtocolSupport/CustomerCode.cs index d9e6d5e..7d16a6d 100644 --- a/CommonLibrary/ProtocolSupport/CustomerCode.cs +++ b/CommonLibrary/ProtocolSupport/CustomerCode.cs @@ -43,6 +43,9 @@ namespace CommonLibrary * *******************************************************************************************/ + #region 1.1.X 指令块 + + public static NetHandle 维护检查 { get; } = new NetHandle(1, 1, 00001); public static NetHandle 更新检查 { get; } = new NetHandle(1, 1, 00002); public static NetHandle 参数下载 { get; } = new NetHandle(1, 1, 00003); @@ -67,6 +70,7 @@ namespace CommonLibrary public static NetHandle 上传一般配置 { get; } = new NetHandle(1, 1, 00022); + #endregion /******************************************************************************************* @@ -75,6 +79,9 @@ namespace CommonLibrary * *******************************************************************************************/ + #region 1.2.X 指令块 + + public static NetHandle 网络日志查看 { get; } = new NetHandle(1, 2, 00001);//1.2.开头的是日志请求和清空 public static NetHandle 网络日志清空 { get; } = new NetHandle(1, 2, 00002); @@ -96,6 +103,7 @@ namespace CommonLibrary public static NetHandle 头像日志清空 { get; } = new NetHandle(1, 2, 00018); + #endregion /************************************************************************************** diff --git "a/\350\275\257\344\273\266\347\263\273\347\273\237\346\234\215\345\212\241\347\253\257\346\250\241\347\211\210/FormServerWindow.cs" "b/\350\275\257\344\273\266\347\263\273\347\273\237\346\234\215\345\212\241\347\253\257\346\250\241\347\211\210/FormServerWindow.cs" index b1abdb4..1e99dee 100644 --- "a/\350\275\257\344\273\266\347\263\273\347\273\237\346\234\215\345\212\241\347\253\257\346\250\241\347\211\210/FormServerWindow.cs" +++ "b/\350\275\257\344\273\266\347\263\273\347\273\237\346\234\215\345\212\241\347\253\257\346\250\241\347\211\210/FormServerWindow.cs" @@ -536,7 +536,7 @@ namespace 软件系统服务端模版 if (!UserServer.ServerSettings.AllowLoginWhenFramewordVersionNotCheck) { SystemVersion sv = new SystemVersion(frameworkVersion); - if (sv != SoftBasic.FrameworkVersion) + if (sv < SoftBasic.FrameworkVersion) { account.LoginEnable = false; account.ForbidMessage = "框架版本检测失败，请更新"; -- GitLab