From 131376eb7ffbf619ecc19c84343b440d1ed49d52 Mon Sep 17 00:00:00 2001 From: robin Date: Fri, 23 Mar 2018 15:20:00 +0800 Subject: [PATCH] .. --- ClientForWEDS/2017.ico | Bin 0 -> 16958 bytes ClientForWEDS/ClientForWEDS.csproj | 6 + ClientForWEDS/ConfigUtil.cs | 10 +- ClientForWEDS/Form1.Designer.cs | 297 ++++++++++++++++++----------- ClientForWEDS/Form1.cs | 18 ++ 5 files changed, 215 insertions(+), 116 deletions(-) create mode 100644 ClientForWEDS/2017.ico diff --git a/ClientForWEDS/2017.ico b/ClientForWEDS/2017.ico new file mode 100644 index 0000000000000000000000000000000000000000..0039897529fa06a1af36e0fa7720ddb59064e85c GIT binary patch literal 16958 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 V)=Ab)$jbt|@efE>S!bK>{|Ce9Xw3is literal 0 HcmV?d00001 diff --git a/ClientForWEDS/ClientForWEDS.csproj b/ClientForWEDS/ClientForWEDS.csproj index b0b74a5..fedcb3a 100644 --- a/ClientForWEDS/ClientForWEDS.csproj +++ b/ClientForWEDS/ClientForWEDS.csproj @@ -33,6 +33,9 @@ prompt 4 + + 2017.ico + .\AxInterop.WEDS4_CommSV2.dll @@ -95,7 +98,10 @@ + + + Always diff --git a/ClientForWEDS/ConfigUtil.cs b/ClientForWEDS/ConfigUtil.cs index 15b2cb6..1e2b2db 100644 --- a/ClientForWEDS/ConfigUtil.cs +++ b/ClientForWEDS/ConfigUtil.cs @@ -13,6 +13,9 @@ namespace ClientForWEDS { IP1 = nutFile.AsString(ConfigItem.IP1, ""); IP2 = nutFile.AsString(ConfigItem.IP2, ""); IP3 = nutFile.AsString(ConfigItem.IP3, ""); + IP4 = nutFile.AsString(ConfigItem.IP4, ""); + IP5 = nutFile.AsString(ConfigItem.IP5, ""); + IP6 = nutFile.AsString(ConfigItem.IP6, ""); Port = nutFile.AsString(ConfigItem.Port, "3350"); Timeout = nutFile.AsString(ConfigItem.Timeout, "8000"); ValidateType = nutFile.AsString(ConfigItem.ValidateType, "no"); @@ -26,7 +29,9 @@ namespace ClientForWEDS { public static string IP1; public static string IP2; public static string IP3; - + public static string IP4; + public static string IP5; + public static string IP6; public static string Port; public static string Timeout; public static string ValidateType; @@ -40,6 +45,9 @@ namespace ClientForWEDS { public const string IP1 = "IP1"; public const string IP2 = "IP2"; public const string IP3 = "IP3"; + public const string IP4 = "IP4"; + public const string IP5 = "IP5"; + public const string IP6 = "IP6"; public const string Port = "Port"; public const string Timeout = "Timeout"; diff --git a/ClientForWEDS/Form1.Designer.cs b/ClientForWEDS/Form1.Designer.cs index 3ee1747..9c4d819 100644 --- a/ClientForWEDS/Form1.Designer.cs +++ b/ClientForWEDS/Form1.Designer.cs @@ -32,6 +32,9 @@ this.panel1 = new System.Windows.Forms.Panel(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tpConnection = new System.Windows.Forms.TabPage(); + this.passTextBox = new System.Windows.Forms.TextBox(); + this.userTextBox = new System.Windows.Forms.TextBox(); + this.erpTextBox = new System.Windows.Forms.TextBox(); this.txtReciveZDPath = new System.Windows.Forms.TextBox(); this.lblRSvFilePath = new System.Windows.Forms.Label(); this.lblRZdFilePath = new System.Windows.Forms.Label(); @@ -49,14 +52,21 @@ this.lblConnPort = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.txtIP3 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); this.txtIP2 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); this.lblConnIP = new System.Windows.Forms.Label(); this.txtIP = new System.Windows.Forms.TextBox(); this.lblLinkParameter = new System.Windows.Forms.Label(); this.cbLineMd = new System.Windows.Forms.ComboBox(); this.lblLinkModel = new System.Windows.Forms.Label(); this.tpReciveFile = new System.Windows.Forms.TabPage(); + this.label7 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); this.lblRZysx1 = new System.Windows.Forms.Label(); this.lblRZysx = new System.Windows.Forms.Label(); @@ -102,17 +112,13 @@ this.lblZdLinked = new System.Windows.Forms.Label(); this.lblZdLinkStateInfo = new System.Windows.Forms.Label(); this.saveFileDialogRecive = new System.Windows.Forms.SaveFileDialog(); - this.erpTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.userTextBox = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.passTextBox = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.button2 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); this.openFileDialogDangAn = new System.Windows.Forms.OpenFileDialog(); + this.txtIP4 = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.txtIP5 = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.txtIP6 = new System.Windows.Forms.TextBox(); + this.label11 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.axW4commsv21)).BeginInit(); this.panel1.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -152,13 +158,14 @@ this.btntpRecive.TabIndex = 10; this.btntpRecive.Text = "采集考勤到PC"; this.btntpRecive.UseVisualStyleBackColor = true; + this.btntpRecive.Click += new System.EventHandler(this.btntpRecive_Click); // // panel1 // this.panel1.Controls.Add(this.tabControl1); this.panel1.Location = new System.Drawing.Point(175, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(454, 443); + this.panel1.Size = new System.Drawing.Size(454, 539); this.panel1.TabIndex = 11; // // tabControl1 @@ -172,7 +179,7 @@ this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(451, 479); + this.tabControl1.Size = new System.Drawing.Size(451, 557); this.tabControl1.TabIndex = 1; // // tpConnection @@ -195,7 +202,13 @@ this.tpConnection.Controls.Add(this.nudPort); this.tpConnection.Controls.Add(this.lblConnTimeout); this.tpConnection.Controls.Add(this.lblConnPort); + this.tpConnection.Controls.Add(this.label11); + this.tpConnection.Controls.Add(this.label10); + this.tpConnection.Controls.Add(this.label9); this.tpConnection.Controls.Add(this.label2); + this.tpConnection.Controls.Add(this.txtIP6); + this.tpConnection.Controls.Add(this.txtIP5); + this.tpConnection.Controls.Add(this.txtIP4); this.tpConnection.Controls.Add(this.txtIP3); this.tpConnection.Controls.Add(this.label6); this.tpConnection.Controls.Add(this.label1); @@ -210,14 +223,37 @@ this.tpConnection.Location = new System.Drawing.Point(4, 4); this.tpConnection.Name = "tpConnection"; this.tpConnection.Padding = new System.Windows.Forms.Padding(3); - this.tpConnection.Size = new System.Drawing.Size(443, 453); + this.tpConnection.Size = new System.Drawing.Size(443, 531); this.tpConnection.TabIndex = 0; this.tpConnection.Text = "终端连接/断开"; this.tpConnection.UseVisualStyleBackColor = true; // + // passTextBox + // + this.passTextBox.Location = new System.Drawing.Point(248, 433); + this.passTextBox.Name = "passTextBox"; + this.passTextBox.Size = new System.Drawing.Size(84, 21); + this.passTextBox.TabIndex = 31; + this.passTextBox.UseSystemPasswordChar = true; + // + // userTextBox + // + this.userTextBox.Location = new System.Drawing.Point(70, 433); + this.userTextBox.Name = "userTextBox"; + this.userTextBox.Size = new System.Drawing.Size(84, 21); + this.userTextBox.TabIndex = 31; + // + // erpTextBox + // + this.erpTextBox.Location = new System.Drawing.Point(70, 411); + this.erpTextBox.Name = "erpTextBox"; + this.erpTextBox.Size = new System.Drawing.Size(262, 21); + this.erpTextBox.TabIndex = 31; + this.erpTextBox.Text = "http://"; + // // txtReciveZDPath // - this.txtReciveZDPath.Location = new System.Drawing.Point(70, 287); + this.txtReciveZDPath.Location = new System.Drawing.Point(70, 355); this.txtReciveZDPath.Name = "txtReciveZDPath"; this.txtReciveZDPath.Size = new System.Drawing.Size(262, 21); this.txtReciveZDPath.TabIndex = 30; @@ -226,7 +262,7 @@ // lblRSvFilePath // this.lblRSvFilePath.AutoSize = true; - this.lblRSvFilePath.Location = new System.Drawing.Point(6, 319); + this.lblRSvFilePath.Location = new System.Drawing.Point(6, 387); this.lblRSvFilePath.Name = "lblRSvFilePath"; this.lblRSvFilePath.Size = new System.Drawing.Size(65, 12); this.lblRSvFilePath.TabIndex = 28; @@ -236,7 +272,7 @@ // lblRZdFilePath // this.lblRZdFilePath.AutoSize = true; - this.lblRZdFilePath.Location = new System.Drawing.Point(6, 255); + this.lblRZdFilePath.Location = new System.Drawing.Point(6, 323); this.lblRZdFilePath.Name = "lblRZdFilePath"; this.lblRZdFilePath.Size = new System.Drawing.Size(239, 12); this.lblRZdFilePath.TabIndex = 27; @@ -245,7 +281,7 @@ // btnDisconnection // this.btnDisconnection.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDisconnection.Location = new System.Drawing.Point(252, 405); + this.btnDisconnection.Location = new System.Drawing.Point(253, 475); this.btnDisconnection.Name = "btnDisconnection"; this.btnDisconnection.Size = new System.Drawing.Size(75, 23); this.btnDisconnection.TabIndex = 26; @@ -256,7 +292,7 @@ // btnConnection // this.btnConnection.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnConnection.Location = new System.Drawing.Point(169, 405); + this.btnConnection.Location = new System.Drawing.Point(170, 475); this.btnConnection.Name = "btnConnection"; this.btnConnection.Size = new System.Drawing.Size(75, 23); this.btnConnection.TabIndex = 26; @@ -267,7 +303,7 @@ // saveBt // this.saveBt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.saveBt.Location = new System.Drawing.Point(79, 405); + this.saveBt.Location = new System.Drawing.Point(80, 475); this.saveBt.Name = "saveBt"; this.saveBt.Size = new System.Drawing.Size(75, 23); this.saveBt.TabIndex = 24; @@ -277,7 +313,7 @@ // // txtValidate // - this.txtValidate.Location = new System.Drawing.Point(231, 179); + this.txtValidate.Location = new System.Drawing.Point(231, 247); this.txtValidate.Multiline = true; this.txtValidate.Name = "txtValidate"; this.txtValidate.Size = new System.Drawing.Size(147, 65); @@ -287,7 +323,7 @@ // rbAdminValidate // this.rbAdminValidate.AutoSize = true; - this.rbAdminValidate.Location = new System.Drawing.Point(129, 223); + this.rbAdminValidate.Location = new System.Drawing.Point(129, 291); this.rbAdminValidate.Name = "rbAdminValidate"; this.rbAdminValidate.Size = new System.Drawing.Size(83, 16); this.rbAdminValidate.TabIndex = 22; @@ -299,7 +335,7 @@ // rbPassValidate // this.rbPassValidate.AutoSize = true; - this.rbPassValidate.Location = new System.Drawing.Point(129, 202); + this.rbPassValidate.Location = new System.Drawing.Point(129, 270); this.rbPassValidate.Name = "rbPassValidate"; this.rbPassValidate.Size = new System.Drawing.Size(71, 16); this.rbPassValidate.TabIndex = 21; @@ -311,7 +347,7 @@ // rbNoValidate // this.rbNoValidate.AutoSize = true; - this.rbNoValidate.Location = new System.Drawing.Point(129, 180); + this.rbNoValidate.Location = new System.Drawing.Point(129, 248); this.rbNoValidate.Name = "rbNoValidate"; this.rbNoValidate.Size = new System.Drawing.Size(59, 16); this.rbNoValidate.TabIndex = 20; @@ -323,7 +359,7 @@ // lblValidateString // this.lblValidateString.AutoSize = true; - this.lblValidateString.Location = new System.Drawing.Point(6, 179); + this.lblValidateString.Location = new System.Drawing.Point(6, 247); this.lblValidateString.Name = "lblValidateString"; this.lblValidateString.Size = new System.Drawing.Size(95, 12); this.lblValidateString.TabIndex = 19; @@ -331,7 +367,7 @@ // // txtTimeout // - this.txtTimeout.Location = new System.Drawing.Point(299, 106); + this.txtTimeout.Location = new System.Drawing.Point(299, 109); this.txtTimeout.Name = "txtTimeout"; this.txtTimeout.Size = new System.Drawing.Size(120, 21); this.txtTimeout.TabIndex = 8; @@ -361,7 +397,7 @@ // // lblConnTimeout // - this.lblConnTimeout.Location = new System.Drawing.Point(233, 107); + this.lblConnTimeout.Location = new System.Drawing.Point(233, 112); this.lblConnTimeout.Name = "lblConnTimeout"; this.lblConnTimeout.Size = new System.Drawing.Size(60, 12); this.lblConnTimeout.TabIndex = 6; @@ -379,43 +415,70 @@ // // label2 // - this.label2.Location = new System.Drawing.Point(43, 139); + this.label2.Location = new System.Drawing.Point(43, 150); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(58, 14); this.label2.TabIndex = 4; - this.label2.Text = "IP地址:"; + this.label2.Text = "IP地址3:"; this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight; // // txtIP3 // - this.txtIP3.Location = new System.Drawing.Point(107, 136); + this.txtIP3.Location = new System.Drawing.Point(107, 147); this.txtIP3.Name = "txtIP3"; this.txtIP3.Size = new System.Drawing.Size(120, 21); this.txtIP3.TabIndex = 5; // + // label6 + // + this.label6.Location = new System.Drawing.Point(201, 436); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(41, 14); + this.label6.TabIndex = 4; + this.label6.Text = "密码:"; + this.label6.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // label1 // - this.label1.Location = new System.Drawing.Point(43, 107); + this.label1.Location = new System.Drawing.Point(43, 112); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(58, 14); this.label1.TabIndex = 4; - this.label1.Text = "IP地址:"; + this.label1.Text = "IP地址2:"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // + // label5 + // + this.label5.Location = new System.Drawing.Point(23, 436); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(41, 14); + this.label5.TabIndex = 4; + this.label5.Text = "用户:"; + this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // txtIP2 // - this.txtIP2.Location = new System.Drawing.Point(107, 104); + this.txtIP2.Location = new System.Drawing.Point(107, 109); this.txtIP2.Name = "txtIP2"; this.txtIP2.Size = new System.Drawing.Size(120, 21); this.txtIP2.TabIndex = 4; // + // label4 + // + this.label4.Location = new System.Drawing.Point(23, 414); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(41, 14); + this.label4.TabIndex = 4; + this.label4.Text = "地址:"; + this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // lblConnIP // this.lblConnIP.Location = new System.Drawing.Point(43, 75); this.lblConnIP.Name = "lblConnIP"; this.lblConnIP.Size = new System.Drawing.Size(58, 14); this.lblConnIP.TabIndex = 4; - this.lblConnIP.Text = "IP地址:"; + this.lblConnIP.Text = "IP地址1:"; this.lblConnIP.TextAlign = System.Drawing.ContentAlignment.TopRight; // // txtIP @@ -471,11 +534,47 @@ this.tpReciveFile.Location = new System.Drawing.Point(4, 4); this.tpReciveFile.Name = "tpReciveFile"; this.tpReciveFile.Padding = new System.Windows.Forms.Padding(3); - this.tpReciveFile.Size = new System.Drawing.Size(443, 453); + this.tpReciveFile.Size = new System.Drawing.Size(443, 531); this.tpReciveFile.TabIndex = 1; this.tpReciveFile.Text = "终端文件读取到PC"; this.tpReciveFile.UseVisualStyleBackColor = true; // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(52, 289); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(95, 12); + this.label7.TabIndex = 20; + this.label7.Text = "服务器文件路径:"; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(369, 317); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(27, 23); + this.button2.TabIndex = 19; + this.button2.Text = "…"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(128, 319); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(235, 21); + this.textBox1.TabIndex = 18; + // + // label8 + // + this.label8.Location = new System.Drawing.Point(30, 322); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(92, 12); + this.label8.TabIndex = 17; + this.label8.Text = "记录路径"; + this.label8.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // button1 // this.button1.Location = new System.Drawing.Point(184, 356); @@ -564,7 +663,7 @@ this.tpSendFile.Location = new System.Drawing.Point(4, 4); this.tpSendFile.Name = "tpSendFile"; this.tpSendFile.Padding = new System.Windows.Forms.Padding(3); - this.tpSendFile.Size = new System.Drawing.Size(443, 453); + this.tpSendFile.Size = new System.Drawing.Size(443, 531); this.tpSendFile.TabIndex = 2; this.tpSendFile.Text = "PC文件写入到终端"; this.tpSendFile.UseVisualStyleBackColor = true; @@ -728,7 +827,7 @@ this.tpReciveFromAny.Location = new System.Drawing.Point(4, 4); this.tpReciveFromAny.Name = "tpReciveFromAny"; this.tpReciveFromAny.Padding = new System.Windows.Forms.Padding(3); - this.tpReciveFromAny.Size = new System.Drawing.Size(443, 453); + this.tpReciveFromAny.Size = new System.Drawing.Size(443, 531); this.tpReciveFromAny.TabIndex = 6; this.tpReciveFromAny.Text = "同时多台终端通讯"; this.tpReciveFromAny.UseVisualStyleBackColor = true; @@ -852,7 +951,7 @@ // lblZdUdpData // this.lblZdUdpData.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblZdUdpData.Location = new System.Drawing.Point(650, 250); + this.lblZdUdpData.Location = new System.Drawing.Point(652, 300); this.lblZdUdpData.Name = "lblZdUdpData"; this.lblZdUdpData.Size = new System.Drawing.Size(259, 12); this.lblZdUdpData.TabIndex = 30; @@ -861,9 +960,9 @@ // // txtUDP // - this.txtUDP.Location = new System.Drawing.Point(636, 268); + this.txtUDP.Location = new System.Drawing.Point(636, 315); this.txtUDP.Name = "txtUDP"; - this.txtUDP.Size = new System.Drawing.Size(295, 170); + this.txtUDP.Size = new System.Drawing.Size(295, 227); this.txtUDP.TabIndex = 29; this.txtUDP.Text = ""; // @@ -871,7 +970,7 @@ // this.txtLog.Location = new System.Drawing.Point(636, 77); this.txtLog.Name = "txtLog"; - this.txtLog.Size = new System.Drawing.Size(295, 170); + this.txtLog.Size = new System.Drawing.Size(295, 214); this.txtLog.TabIndex = 28; this.txtLog.Text = ""; // @@ -908,97 +1007,59 @@ // this.saveFileDialogRecive.Filter = "所有文件|*.*"; // - // erpTextBox - // - this.erpTextBox.Location = new System.Drawing.Point(70, 343); - this.erpTextBox.Name = "erpTextBox"; - this.erpTextBox.Size = new System.Drawing.Size(262, 21); - this.erpTextBox.TabIndex = 31; - this.erpTextBox.Text = "http://"; - // - // label4 - // - this.label4.Location = new System.Drawing.Point(23, 346); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(41, 14); - this.label4.TabIndex = 4; - this.label4.Text = "地址:"; - this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label5 - // - this.label5.Location = new System.Drawing.Point(23, 368); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(41, 14); - this.label5.TabIndex = 4; - this.label5.Text = "用户:"; - this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // userTextBox - // - this.userTextBox.Location = new System.Drawing.Point(70, 365); - this.userTextBox.Name = "userTextBox"; - this.userTextBox.Size = new System.Drawing.Size(84, 21); - this.userTextBox.TabIndex = 31; - // - // label6 + // txtIP4 // - this.label6.Location = new System.Drawing.Point(201, 368); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(41, 14); - this.label6.TabIndex = 4; - this.label6.Text = "密码:"; - this.label6.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.txtIP4.Location = new System.Drawing.Point(107, 185); + this.txtIP4.Name = "txtIP4"; + this.txtIP4.Size = new System.Drawing.Size(120, 21); + this.txtIP4.TabIndex = 5; // - // passTextBox + // label9 // - this.passTextBox.Location = new System.Drawing.Point(248, 365); - this.passTextBox.Name = "passTextBox"; - this.passTextBox.Size = new System.Drawing.Size(84, 21); - this.passTextBox.TabIndex = 31; - this.passTextBox.UseSystemPasswordChar = true; + this.label9.Location = new System.Drawing.Point(43, 188); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(58, 14); + this.label9.TabIndex = 4; + this.label9.Text = "IP地址4:"; + this.label9.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // label7 + // txtIP5 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(52, 289); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(95, 12); - this.label7.TabIndex = 20; - this.label7.Text = "服务器文件路径:"; + this.txtIP5.Location = new System.Drawing.Point(299, 147); + this.txtIP5.Name = "txtIP5"; + this.txtIP5.Size = new System.Drawing.Size(120, 21); + this.txtIP5.TabIndex = 5; // - // button2 + // label10 // - this.button2.Location = new System.Drawing.Point(369, 317); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(27, 23); - this.button2.TabIndex = 19; - this.button2.Text = "…"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); + this.label10.Location = new System.Drawing.Point(235, 150); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(58, 14); + this.label10.TabIndex = 4; + this.label10.Text = "IP地址5:"; + this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // textBox1 + // txtIP6 // - this.textBox1.Location = new System.Drawing.Point(128, 319); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(235, 21); - this.textBox1.TabIndex = 18; + this.txtIP6.Location = new System.Drawing.Point(299, 182); + this.txtIP6.Name = "txtIP6"; + this.txtIP6.Size = new System.Drawing.Size(120, 21); + this.txtIP6.TabIndex = 5; // - // label8 + // label11 // - this.label8.Location = new System.Drawing.Point(30, 322); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(92, 12); - this.label8.TabIndex = 17; - this.label8.Text = "记录路径"; - this.label8.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.label11.Location = new System.Drawing.Point(235, 185); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(58, 17); + this.label11.TabIndex = 4; + this.label11.Text = "IP地址6:"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight; // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(937, 450); + this.ClientSize = new System.Drawing.Size(937, 546); this.Controls.Add(this.lblState); this.Controls.Add(this.lblZdLinked); this.Controls.Add(this.lblZdLinkStateInfo); @@ -1117,6 +1178,12 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Label label8; private System.Windows.Forms.OpenFileDialog openFileDialogDangAn; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox txtIP6; + private System.Windows.Forms.TextBox txtIP5; + private System.Windows.Forms.TextBox txtIP4; } } diff --git a/ClientForWEDS/Form1.cs b/ClientForWEDS/Form1.cs index 70df537..ed5c730 100644 --- a/ClientForWEDS/Form1.cs +++ b/ClientForWEDS/Form1.cs @@ -37,6 +37,9 @@ namespace ClientForWEDS { txtIP.Text = ConfigUtil.IP1; txtIP2.Text = ConfigUtil.IP2; txtIP3.Text = ConfigUtil.IP3; + txtIP4.Text = ConfigUtil.IP4; + txtIP5.Text = ConfigUtil.IP5; + txtIP6.Text = ConfigUtil.IP6; txtTimeout.Text = ConfigUtil.Timeout; nudPort.Text = ConfigUtil.Port; txtReciveZDPath.Text = ConfigUtil.ZDPath; @@ -363,6 +366,13 @@ namespace ClientForWEDS { ipList.Add(txtIP2.Text); if (txtIP3.Text.Length > 0) ipList.Add(txtIP3.Text); + if (txtIP4.Text.Length > 0) + ipList.Add(txtIP4.Text); + if (txtIP5.Text.Length > 0) + ipList.Add(txtIP5.Text); + if (txtIP6.Text.Length > 0) + ipList.Add(txtIP6.Text); + _zdPath = txtReciveZDPath.Text.Trim(); on_off = false; ma.Set(); @@ -390,6 +400,10 @@ namespace ClientForWEDS { nutFile.SetValue(ConfigUtil.ConfigItem.IP1, txtIP.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.IP2, txtIP2.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.IP3, txtIP3.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP4, txtIP4.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP5, txtIP5.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP6, txtIP6.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.Port, nudPort.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.Timeout, txtTimeout.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.ZDPath, txtReciveZDPath.Text.Trim()); @@ -535,5 +549,9 @@ namespace ClientForWEDS { textBox1.Text = openFileDialogDangAn.FileName; } } + + private void btntpRecive_Click(object sender, EventArgs e) { + + } } }