diff --git a/ClientForWEDS/2017.ico b/ClientForWEDS/2017.ico
new file mode 100644
index 0000000..0039897
Binary files /dev/null and b/ClientForWEDS/2017.ico differ
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) {
+
+ }
}
}