From ac8dda46dd79aeff911a2b26632110f12a2622da Mon Sep 17 00:00:00 2001 From: wisdomwei201804 Date: Mon, 23 Apr 2018 00:11:02 +0800 Subject: [PATCH] =?UTF-8?q?v3.8.3.0=20=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8D=87=E7=BA=A7=E6=A3=80=E6=B5=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=822=E3=80=81=E8=B0=83=E8=AF=95=E4=B8=AD...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Form_About.Designer.cs | 125 +++++-- .../net.nutcore.aliddns/Form_About.cs | 70 +++- .../net.nutcore.aliddns/Program.cs | 1 + .../Properties/AssemblyInfo.cs | 4 +- .../net.nutcore.aliddns/main.Designer.cs | 313 ++++++++---------- .../net.nutcore.aliddns/main.cs | 26 +- .../net.nutcore.aliddns.csproj | 1 + .../net.nutcore.aliddns/updateinfo.txt | 3 + 8 files changed, 324 insertions(+), 219 deletions(-) diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.Designer.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.Designer.cs index 262102f..952470b 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.Designer.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.Designer.cs @@ -37,7 +37,14 @@ this.PublishLink = new System.Windows.Forms.LinkLabel(); this.personalWebsite = new System.Windows.Forms.LinkLabel(); this.textBox_updateInfo = new System.Windows.Forms.TextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label_currentVer = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label_latestVer = new System.Windows.Forms.Label(); + this.checkBox_autoCheckUpdate = new System.Windows.Forms.CheckBox(); this.authorInformation.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // authorInformation @@ -48,11 +55,9 @@ this.authorInformation.Controls.Add(this.label1); this.authorInformation.Controls.Add(this.PublishLink); this.authorInformation.Controls.Add(this.personalWebsite); - this.authorInformation.Location = new System.Drawing.Point(18, 18); - this.authorInformation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.authorInformation.Location = new System.Drawing.Point(12, 71); this.authorInformation.Name = "authorInformation"; - this.authorInformation.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.authorInformation.Size = new System.Drawing.Size(363, 136); + this.authorInformation.Size = new System.Drawing.Size(242, 81); this.authorInformation.TabIndex = 8; this.authorInformation.TabStop = false; this.authorInformation.Text = "著作信息"; @@ -60,20 +65,18 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(9, 93); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(6, 62); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(143, 18); + this.label3.Size = new System.Drawing.Size(95, 12); this.label3.TabIndex = 6; this.label3.Text = "本程序发布地址:"; // // linkLabel1 // this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(160, 58); - this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel1.Location = new System.Drawing.Point(107, 39); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(116, 18); + this.linkLabel1.Size = new System.Drawing.Size(77, 12); this.linkLabel1.TabIndex = 5; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "阿里开发论坛"; @@ -82,30 +85,27 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 58); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(6, 39); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(143, 18); + this.label2.Size = new System.Drawing.Size(95, 12); this.label2.TabIndex = 4; this.label2.Text = "原程序发布地址:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 26); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(6, 17); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(107, 18); + this.label1.Size = new System.Drawing.Size(71, 12); this.label1.TabIndex = 3; this.label1.Text = "原作者主页:"; // // PublishLink // this.PublishLink.AutoSize = true; - this.PublishLink.Location = new System.Drawing.Point(160, 93); - this.PublishLink.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.PublishLink.Location = new System.Drawing.Point(107, 62); this.PublishLink.Name = "PublishLink"; - this.PublishLink.Size = new System.Drawing.Size(188, 18); + this.PublishLink.Size = new System.Drawing.Size(125, 12); this.PublishLink.TabIndex = 2; this.PublishLink.TabStop = true; this.PublishLink.Text = "AliDDNS 3.0 之后版本"; @@ -114,10 +114,9 @@ // personalWebsite // this.personalWebsite.AutoSize = true; - this.personalWebsite.Location = new System.Drawing.Point(124, 26); - this.personalWebsite.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.personalWebsite.Location = new System.Drawing.Point(83, 17); this.personalWebsite.Name = "personalWebsite"; - this.personalWebsite.Size = new System.Drawing.Size(143, 18); + this.personalWebsite.Size = new System.Drawing.Size(95, 12); this.personalWebsite.TabIndex = 1; this.personalWebsite.TabStop = true; this.personalWebsite.Text = "www.nutcore.net"; @@ -125,28 +124,92 @@ // // textBox_updateInfo // - this.textBox_updateInfo.Location = new System.Drawing.Point(18, 164); - this.textBox_updateInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox_updateInfo.Location = new System.Drawing.Point(12, 158); this.textBox_updateInfo.Multiline = true; this.textBox_updateInfo.Name = "textBox_updateInfo"; this.textBox_updateInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox_updateInfo.Size = new System.Drawing.Size(361, 196); + this.textBox_updateInfo.Size = new System.Drawing.Size(242, 119); this.textBox_updateInfo.TabIndex = 9; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.checkBox_autoCheckUpdate); + this.groupBox1.Controls.Add(this.label_latestVer); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label_currentVer); + this.groupBox1.Controls.Add(this.label4); + this.groupBox1.Location = new System.Drawing.Point(12, 3); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(242, 62); + this.groupBox1.TabIndex = 10; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "升级设置"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(6, 19); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(59, 12); + this.label4.TabIndex = 0; + this.label4.Text = "当前版本:"; + // + // label_currentVer + // + this.label_currentVer.AutoSize = true; + this.label_currentVer.Location = new System.Drawing.Point(71, 19); + this.label_currentVer.Name = "label_currentVer"; + this.label_currentVer.Size = new System.Drawing.Size(47, 12); + this.label_currentVer.TabIndex = 1; + this.label_currentVer.Text = "0.0.0.0"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(125, 19); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(59, 12); + this.label6.TabIndex = 2; + this.label6.Text = "最新版本:"; + // + // label_latestVer + // + this.label_latestVer.AutoSize = true; + this.label_latestVer.Location = new System.Drawing.Point(185, 19); + this.label_latestVer.Name = "label_latestVer"; + this.label_latestVer.Size = new System.Drawing.Size(47, 12); + this.label_latestVer.TabIndex = 3; + this.label_latestVer.Text = "0.0.0.0"; + // + // checkBox_autoCheckUpdate + // + this.checkBox_autoCheckUpdate.AutoSize = true; + this.checkBox_autoCheckUpdate.Checked = true; + this.checkBox_autoCheckUpdate.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox_autoCheckUpdate.Location = new System.Drawing.Point(8, 40); + this.checkBox_autoCheckUpdate.Name = "checkBox_autoCheckUpdate"; + this.checkBox_autoCheckUpdate.Size = new System.Drawing.Size(96, 16); + this.checkBox_autoCheckUpdate.TabIndex = 4; + this.checkBox_autoCheckUpdate.Text = "自动检测升级"; + this.checkBox_autoCheckUpdate.UseVisualStyleBackColor = true; + this.checkBox_autoCheckUpdate.CheckedChanged += new System.EventHandler(this.checkBox_autoCheckUpdate_CheckedChanged); + // // Form_About // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(400, 380); + this.ClientSize = new System.Drawing.Size(267, 289); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.textBox_updateInfo); this.Controls.Add(this.authorInformation); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "Form_About"; this.Text = "关于"; this.authorInformation.ResumeLayout(false); this.authorInformation.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -162,5 +225,11 @@ private System.Windows.Forms.LinkLabel PublishLink; private System.Windows.Forms.LinkLabel personalWebsite; private System.Windows.Forms.TextBox textBox_updateInfo; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.CheckBox checkBox_autoCheckUpdate; + private System.Windows.Forms.Label label_latestVer; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label_currentVer; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.cs index 797f617..86654e0 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_About.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; using System.Text; using System.IO; -using System.Threading.Tasks; using System.Windows.Forms; +using System.Xml; namespace net.nutcore.aliddns { @@ -15,9 +10,13 @@ namespace net.nutcore.aliddns { public Form_About() { + InitializeComponent(); this.MinimizeBox = false; //取消窗口最小化按钮 this.MaximizeBox = false; //取消窗口最大化按钮 + if (mainForm.checkUpdate == true) + checkBox_autoCheckUpdate.Checked = true; + else checkBox_autoCheckUpdate.Checked = false; textBox_updateInfo.ReadOnly = true; string filePath = System.AppDomain.CurrentDomain.BaseDirectory; string updateInfoFile = filePath + "updateinfo.txt"; @@ -41,5 +40,64 @@ namespace net.nutcore.aliddns { System.Diagnostics.Process.Start("explorer.exe", "https://bbs.aliyun.com/read/289624.html"); } + + private void checkBox_autoCheckUpdate_CheckedChanged(object sender, EventArgs e) + { + string ExePath = System.AppDomain.CurrentDomain.BaseDirectory; + string config_file = ExePath + "aliddns_config.xml"; + if(File.Exists(config_file)) + { + XmlDocument xmlDOC = new XmlDocument(); + xmlDOC.Load(config_file); + if (xmlDOC.GetElementsByTagName("autoCheckUpdate")[0] == null) + { + XmlNode node = xmlDOC.CreateNode(XmlNodeType.Element, "autoCheckUpdate",null); + if (checkBox_autoCheckUpdate.Checked == true) + node.InnerText = "On"; + else + node.InnerText = "Off"; + xmlDOC.DocumentElement.AppendChild(node); + xmlDOC.Save(config_file); + } + else + { + XmlNode node = xmlDOC.GetElementsByTagName("autoCheckUpdate")[0]; + if (checkBox_autoCheckUpdate.Checked == true) + node.InnerText = "On"; + else + node.InnerText = "Off"; + xmlDOC.DocumentElement.AppendChild(node); + xmlDOC.Save(config_file); + } + } + /* + ExeConfigurationFileMap map = new ExeConfigurationFileMap(); + map.ExeConfigFilename = config_file; + Configuration config = ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None); + if(checkBox_autoCheckUpdate.Checked == true) + { + if (config.AppSettings.Settings["autoCheckUpdate"] == null) + { + config.AppSettings.Settings.Add("autoCheckUpdate", "On"); + } + else + { + config.AppSettings.Settings["autoCheckUpdate"].Value = "On"; + } + } + else + { + if (config.AppSettings.Settings["autoCheckUpdate"] == null) + { + config.AppSettings.Settings.Add("autoCheckUpdate", "Off"); + } + else + { + config.AppSettings.Settings["autoCheckUpdate"].Value = "Off"; + } + } + config.Save(); + */ + } } } diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Program.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Program.cs index c5baf2a..758e850 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Program.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Program.cs @@ -9,6 +9,7 @@ namespace net.nutcore.aliddns { static class Program { + //static bool checkUpdate; //用于检测是否自动升级 static System.Threading.Mutex _mutex; //定义为类变量，而非局部变量，用于检测线程 /// /// 应用程序的主入口点。 diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs index 8789804..110a28b 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.8.2.1")] -[assembly: AssemblyFileVersion("3.8.2.1")] +[assembly: AssemblyVersion("3.8.3.0")] +[assembly: AssemblyFileVersion("3.8.3.0")] diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs b/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs index c256515..0a87446 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs @@ -39,6 +39,8 @@ this.label_nextUpdateSeconds = new System.Windows.Forms.Label(); this.updateNow = new System.Windows.Forms.Button(); this.debugMessage = new System.Windows.Forms.GroupBox(); + this.label_TTL = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); this.recordId = new System.Windows.Forms.TextBox(); this.globalValue = new System.Windows.Forms.Label(); this.globalDomainType = new System.Windows.Forms.Label(); @@ -48,6 +50,8 @@ this.label10 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.globalSetGroup = new System.Windows.Forms.GroupBox(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox_TTL = new System.Windows.Forms.TextBox(); this.button_ShowHide = new System.Windows.Forms.Button(); this.checkAndSaveConfig = new System.Windows.Forms.Button(); this.label8 = new System.Windows.Forms.Label(); @@ -78,10 +82,6 @@ this.comboBox_whatIsUrl = new System.Windows.Forms.ComboBox(); this.button_whatIsTest = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label(); - this.textBox_TTL = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label_TTL = new System.Windows.Forms.Label(); this.timeSetGroup.SuspendLayout(); this.debugMessage.SuspendLayout(); this.globalSetGroup.SuspendLayout(); @@ -99,11 +99,9 @@ this.timeSetGroup.Controls.Add(this.label3); this.timeSetGroup.Controls.Add(this.label_nextUpdateSeconds); this.timeSetGroup.Controls.Add(this.updateNow); - this.timeSetGroup.Location = new System.Drawing.Point(18, 278); - this.timeSetGroup.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.timeSetGroup.Location = new System.Drawing.Point(12, 185); this.timeSetGroup.Name = "timeSetGroup"; - this.timeSetGroup.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.timeSetGroup.Size = new System.Drawing.Size(302, 217); + this.timeSetGroup.Size = new System.Drawing.Size(201, 145); this.timeSetGroup.TabIndex = 4; this.timeSetGroup.TabStop = false; this.timeSetGroup.Text = "其它设置"; @@ -111,10 +109,9 @@ // checkBox_logAutoSave // this.checkBox_logAutoSave.AutoSize = true; - this.checkBox_logAutoSave.Location = new System.Drawing.Point(13, 106); - this.checkBox_logAutoSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBox_logAutoSave.Location = new System.Drawing.Point(9, 71); this.checkBox_logAutoSave.Name = "checkBox_logAutoSave"; - this.checkBox_logAutoSave.Size = new System.Drawing.Size(142, 22); + this.checkBox_logAutoSave.Size = new System.Drawing.Size(96, 16); this.checkBox_logAutoSave.TabIndex = 8; this.checkBox_logAutoSave.Text = "日志自动转储"; this.checkBox_logAutoSave.UseVisualStyleBackColor = true; @@ -123,10 +120,9 @@ // checkBox_minimized // this.checkBox_minimized.AutoSize = true; - this.checkBox_minimized.Location = new System.Drawing.Point(13, 66); - this.checkBox_minimized.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBox_minimized.Location = new System.Drawing.Point(9, 44); this.checkBox_minimized.Name = "checkBox_minimized"; - this.checkBox_minimized.Size = new System.Drawing.Size(142, 22); + this.checkBox_minimized.Size = new System.Drawing.Size(96, 16); this.checkBox_minimized.TabIndex = 7; this.checkBox_minimized.Text = "启动时最小化"; this.checkBox_minimized.UseVisualStyleBackColor = true; @@ -137,10 +133,9 @@ this.checkBox_autoUpdate.AutoSize = true; this.checkBox_autoUpdate.Checked = true; this.checkBox_autoUpdate.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox_autoUpdate.Location = new System.Drawing.Point(13, 146); - this.checkBox_autoUpdate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBox_autoUpdate.Location = new System.Drawing.Point(9, 97); this.checkBox_autoUpdate.Name = "checkBox_autoUpdate"; - this.checkBox_autoUpdate.Size = new System.Drawing.Size(106, 22); + this.checkBox_autoUpdate.Size = new System.Drawing.Size(72, 16); this.checkBox_autoUpdate.TabIndex = 6; this.checkBox_autoUpdate.Text = "自动更新"; this.checkBox_autoUpdate.UseVisualStyleBackColor = true; @@ -149,10 +144,9 @@ // checkBox_autoBoot // this.checkBox_autoBoot.AutoSize = true; - this.checkBox_autoBoot.Location = new System.Drawing.Point(13, 29); - this.checkBox_autoBoot.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBox_autoBoot.Location = new System.Drawing.Point(9, 19); this.checkBox_autoBoot.Name = "checkBox_autoBoot"; - this.checkBox_autoBoot.Size = new System.Drawing.Size(124, 22); + this.checkBox_autoBoot.Size = new System.Drawing.Size(84, 16); this.checkBox_autoBoot.TabIndex = 5; this.checkBox_autoBoot.Text = "随系统启动"; this.checkBox_autoBoot.UseVisualStyleBackColor = true; @@ -161,10 +155,9 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(176, 148); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(117, 99); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(116, 18); + this.label3.Size = new System.Drawing.Size(77, 12); this.label3.TabIndex = 4; this.label3.Text = "秒后更新记录"; // @@ -172,19 +165,17 @@ // this.label_nextUpdateSeconds.AutoSize = true; this.label_nextUpdateSeconds.ForeColor = System.Drawing.Color.Red; - this.label_nextUpdateSeconds.Location = new System.Drawing.Point(146, 148); - this.label_nextUpdateSeconds.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label_nextUpdateSeconds.Location = new System.Drawing.Point(97, 99); this.label_nextUpdateSeconds.Name = "label_nextUpdateSeconds"; - this.label_nextUpdateSeconds.Size = new System.Drawing.Size(26, 18); + this.label_nextUpdateSeconds.Size = new System.Drawing.Size(17, 12); this.label_nextUpdateSeconds.TabIndex = 3; this.label_nextUpdateSeconds.Text = "60"; // // updateNow // - this.updateNow.Location = new System.Drawing.Point(9, 175); - this.updateNow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.updateNow.Location = new System.Drawing.Point(6, 117); this.updateNow.Name = "updateNow"; - this.updateNow.Size = new System.Drawing.Size(278, 34); + this.updateNow.Size = new System.Drawing.Size(185, 23); this.updateNow.TabIndex = 2; this.updateNow.Text = "立即更新"; this.updateNow.UseVisualStyleBackColor = true; @@ -202,91 +193,101 @@ this.debugMessage.Controls.Add(this.globalRR); this.debugMessage.Controls.Add(this.label10); this.debugMessage.Controls.Add(this.label9); - this.debugMessage.Location = new System.Drawing.Point(328, 70); - this.debugMessage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.debugMessage.Location = new System.Drawing.Point(219, 47); this.debugMessage.Name = "debugMessage"; - this.debugMessage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.debugMessage.Size = new System.Drawing.Size(309, 118); + this.debugMessage.Size = new System.Drawing.Size(206, 79); this.debugMessage.TabIndex = 5; this.debugMessage.TabStop = false; this.debugMessage.Text = "调试信息"; // + // label_TTL + // + this.label_TTL.AutoSize = true; + this.label_TTL.Location = new System.Drawing.Point(157, 44); + this.label_TTL.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label_TTL.Name = "label_TTL"; + this.label_TTL.Size = new System.Drawing.Size(41, 12); + this.label_TTL.TabIndex = 10; + this.label_TTL.Text = ""; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(131, 44); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(29, 12); + this.label15.TabIndex = 9; + this.label15.Text = "TTL:"; + // // recordId // - this.recordId.Location = new System.Drawing.Point(102, 27); - this.recordId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.recordId.Location = new System.Drawing.Point(68, 18); this.recordId.Name = "recordId"; - this.recordId.Size = new System.Drawing.Size(172, 28); + this.recordId.Size = new System.Drawing.Size(116, 21); this.recordId.TabIndex = 8; this.recordId.Text = ""; // // globalValue // this.globalValue.AutoSize = true; - this.globalValue.Location = new System.Drawing.Point(70, 90); - this.globalValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.globalValue.Location = new System.Drawing.Point(45, 63); this.globalValue.Name = "globalValue"; - this.globalValue.Size = new System.Drawing.Size(62, 18); + this.globalValue.Size = new System.Drawing.Size(41, 12); this.globalValue.TabIndex = 7; this.globalValue.Text = ""; // // globalDomainType // this.globalDomainType.AutoSize = true; - this.globalDomainType.Location = new System.Drawing.Point(150, 63); - this.globalDomainType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.globalDomainType.Location = new System.Drawing.Point(93, 44); this.globalDomainType.Name = "globalDomainType"; - this.globalDomainType.Size = new System.Drawing.Size(62, 18); + this.globalDomainType.Size = new System.Drawing.Size(41, 12); this.globalDomainType.TabIndex = 6; this.globalDomainType.Text = ""; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(12, 88); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(6, 62); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(62, 18); + this.label12.Size = new System.Drawing.Size(41, 12); this.label12.TabIndex = 5; this.label12.Text = "Value:"; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(101, 62); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(62, 44); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(53, 18); + this.label11.Size = new System.Drawing.Size(35, 12); this.label11.TabIndex = 4; this.label11.Text = "Type:"; // // globalRR // this.globalRR.AutoSize = true; - this.globalRR.Location = new System.Drawing.Point(42, 62); - this.globalRR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.globalRR.Location = new System.Drawing.Point(26, 44); this.globalRR.Name = "globalRR"; - this.globalRR.Size = new System.Drawing.Size(62, 18); + this.globalRR.Size = new System.Drawing.Size(41, 12); this.globalRR.TabIndex = 3; this.globalRR.Text = ""; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(10, 62); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(6, 44); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(35, 18); + this.label10.Size = new System.Drawing.Size(23, 12); this.label10.TabIndex = 2; this.label10.Text = "RR:"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(10, 32); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(7, 21); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(80, 18); + this.label9.Size = new System.Drawing.Size(53, 12); this.label9.TabIndex = 0; this.label9.Text = "RecordId"; // @@ -305,21 +306,37 @@ this.globalSetGroup.Controls.Add(this.label5); this.globalSetGroup.Controls.Add(this.accessKeyId); this.globalSetGroup.Controls.Add(this.label4); - this.globalSetGroup.Location = new System.Drawing.Point(328, 198); - this.globalSetGroup.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.globalSetGroup.Location = new System.Drawing.Point(219, 132); this.globalSetGroup.Name = "globalSetGroup"; - this.globalSetGroup.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.globalSetGroup.Size = new System.Drawing.Size(309, 297); + this.globalSetGroup.Size = new System.Drawing.Size(206, 198); this.globalSetGroup.TabIndex = 6; this.globalSetGroup.TabStop = false; this.globalSetGroup.Text = "设置"; // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(8, 124); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(47, 12); + this.label13.TabIndex = 16; + this.label13.Text = "TTL(秒)"; + // + // textBox_TTL + // + this.textBox_TTL.Location = new System.Drawing.Point(65, 121); + this.textBox_TTL.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox_TTL.Name = "textBox_TTL"; + this.textBox_TTL.Size = new System.Drawing.Size(37, 21); + this.textBox_TTL.TabIndex = 15; + this.textBox_TTL.Text = "600"; + // // button_ShowHide // - this.button_ShowHide.Location = new System.Drawing.Point(159, 254); - this.button_ShowHide.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button_ShowHide.Location = new System.Drawing.Point(106, 169); this.button_ShowHide.Name = "button_ShowHide"; - this.button_ShowHide.Size = new System.Drawing.Size(136, 34); + this.button_ShowHide.Size = new System.Drawing.Size(91, 23); this.button_ShowHide.TabIndex = 14; this.button_ShowHide.Text = "显示录入"; this.button_ShowHide.UseVisualStyleBackColor = true; @@ -327,10 +344,9 @@ // // checkAndSaveConfig // - this.checkAndSaveConfig.Location = new System.Drawing.Point(12, 254); - this.checkAndSaveConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkAndSaveConfig.Location = new System.Drawing.Point(8, 169); this.checkAndSaveConfig.Name = "checkAndSaveConfig"; - this.checkAndSaveConfig.Size = new System.Drawing.Size(140, 34); + this.checkAndSaveConfig.Size = new System.Drawing.Size(93, 23); this.checkAndSaveConfig.TabIndex = 10; this.checkAndSaveConfig.Text = "测试并保存"; this.checkAndSaveConfig.UseVisualStyleBackColor = true; @@ -339,89 +355,80 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(160, 228); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(107, 152); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(98, 18); + this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 8; this.label8.Text = "秒更新一次"; // // newSeconds // - this.newSeconds.Location = new System.Drawing.Point(62, 223); - this.newSeconds.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.newSeconds.Location = new System.Drawing.Point(41, 149); this.newSeconds.Name = "newSeconds"; - this.newSeconds.Size = new System.Drawing.Size(88, 28); + this.newSeconds.Size = new System.Drawing.Size(60, 21); this.newSeconds.TabIndex = 7; this.newSeconds.Text = "60"; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(9, 228); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(6, 152); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(44, 18); + this.label7.Size = new System.Drawing.Size(29, 12); this.label7.TabIndex = 6; this.label7.Text = "每隔"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(9, 147); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(6, 98); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(80, 18); + this.label6.Size = new System.Drawing.Size(53, 12); this.label6.TabIndex = 5; this.label6.Text = "完整域名"; // // fullDomainName // - this.fullDomainName.Location = new System.Drawing.Point(98, 142); - this.fullDomainName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.fullDomainName.Location = new System.Drawing.Point(65, 95); this.fullDomainName.Name = "fullDomainName"; - this.fullDomainName.Size = new System.Drawing.Size(200, 28); + this.fullDomainName.Size = new System.Drawing.Size(135, 21); this.fullDomainName.TabIndex = 4; this.fullDomainName.Text = "www.xxx.com"; this.fullDomainName.ModifiedChanged += new System.EventHandler(this.fullDomainName_ModifiedChanged); // // accessKeySecret // - this.accessKeySecret.Location = new System.Drawing.Point(12, 102); - this.accessKeySecret.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.accessKeySecret.Location = new System.Drawing.Point(8, 68); this.accessKeySecret.Name = "accessKeySecret"; this.accessKeySecret.PasswordChar = '*'; - this.accessKeySecret.Size = new System.Drawing.Size(286, 28); + this.accessKeySecret.Size = new System.Drawing.Size(192, 21); this.accessKeySecret.TabIndex = 3; this.accessKeySecret.Text = "null"; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(9, 80); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(6, 53); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(143, 18); + this.label5.Size = new System.Drawing.Size(95, 12); this.label5.TabIndex = 2; this.label5.Text = "accessKeySecret"; // // accessKeyId // - this.accessKeyId.Location = new System.Drawing.Point(12, 44); - this.accessKeyId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.accessKeyId.Location = new System.Drawing.Point(8, 29); this.accessKeyId.Name = "accessKeyId"; this.accessKeyId.PasswordChar = '*'; - this.accessKeyId.Size = new System.Drawing.Size(286, 28); + this.accessKeyId.Size = new System.Drawing.Size(192, 21); this.accessKeyId.TabIndex = 1; this.accessKeyId.Text = "null"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(9, 21); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(6, 14); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(107, 18); + this.label4.Size = new System.Drawing.Size(71, 12); this.label4.TabIndex = 0; this.label4.Text = "accessKeyId"; // @@ -446,31 +453,30 @@ this.toolStripMenuItem_Exit, this.ToolStripMenuItem_About}); this.contextMenuStrip_sysTrayMenu.Name = "contextMenuStrip1"; - this.contextMenuStrip_sysTrayMenu.Size = new System.Drawing.Size(117, 60); + this.contextMenuStrip_sysTrayMenu.Size = new System.Drawing.Size(101, 48); // // toolStripMenuItem_Exit // this.toolStripMenuItem_Exit.Name = "toolStripMenuItem_Exit"; - this.toolStripMenuItem_Exit.Size = new System.Drawing.Size(116, 28); + this.toolStripMenuItem_Exit.Size = new System.Drawing.Size(100, 22); this.toolStripMenuItem_Exit.Text = "退出"; this.toolStripMenuItem_Exit.Click += new System.EventHandler(this.toolStripMenuItem1_Click); // // ToolStripMenuItem_About // this.ToolStripMenuItem_About.Name = "ToolStripMenuItem_About"; - this.ToolStripMenuItem_About.Size = new System.Drawing.Size(116, 28); + this.ToolStripMenuItem_About.Size = new System.Drawing.Size(100, 22); this.ToolStripMenuItem_About.Text = "关于"; this.ToolStripMenuItem_About.Click += new System.EventHandler(this.ToolStripMenuItem_About_Click); // // textBox_log // - this.textBox_log.Location = new System.Drawing.Point(18, 503); - this.textBox_log.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox_log.Location = new System.Drawing.Point(12, 335); this.textBox_log.Multiline = true; this.textBox_log.Name = "textBox_log"; this.textBox_log.ReadOnly = true; this.textBox_log.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox_log.Size = new System.Drawing.Size(618, 162); + this.textBox_log.Size = new System.Drawing.Size(413, 109); this.textBox_log.TabIndex = 8; // // groupBox_netstate @@ -481,11 +487,9 @@ this.groupBox_netstate.Controls.Add(this.label2); this.groupBox_netstate.Controls.Add(this.localIP); this.groupBox_netstate.Controls.Add(this.label1); - this.groupBox_netstate.Location = new System.Drawing.Point(18, 4); - this.groupBox_netstate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox_netstate.Location = new System.Drawing.Point(12, 3); this.groupBox_netstate.Name = "groupBox_netstate"; - this.groupBox_netstate.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox_netstate.Size = new System.Drawing.Size(620, 57); + this.groupBox_netstate.Size = new System.Drawing.Size(413, 38); this.groupBox_netstate.TabIndex = 9; this.groupBox_netstate.TabStop = false; this.groupBox_netstate.Text = "网络状态"; @@ -494,10 +498,9 @@ // this.label_DomainIpStatus.AutoSize = true; this.label_DomainIpStatus.ForeColor = System.Drawing.Color.Red; - this.label_DomainIpStatus.Location = new System.Drawing.Point(546, 28); - this.label_DomainIpStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label_DomainIpStatus.Location = new System.Drawing.Point(364, 19); this.label_DomainIpStatus.Name = "label_DomainIpStatus"; - this.label_DomainIpStatus.Size = new System.Drawing.Size(62, 18); + this.label_DomainIpStatus.Size = new System.Drawing.Size(41, 12); this.label_DomainIpStatus.TabIndex = 9; this.label_DomainIpStatus.Text = "未绑定"; // @@ -505,50 +508,45 @@ // this.label_localIpStatus.AutoSize = true; this.label_localIpStatus.ForeColor = System.Drawing.Color.Red; - this.label_localIpStatus.Location = new System.Drawing.Point(234, 28); - this.label_localIpStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label_localIpStatus.Location = new System.Drawing.Point(156, 19); this.label_localIpStatus.Name = "label_localIpStatus"; - this.label_localIpStatus.Size = new System.Drawing.Size(62, 18); + this.label_localIpStatus.Size = new System.Drawing.Size(41, 12); this.label_localIpStatus.TabIndex = 8; this.label_localIpStatus.Text = "未连接"; // // domainIP // this.domainIP.AutoSize = true; - this.domainIP.Location = new System.Drawing.Point(388, 28); - this.domainIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.domainIP.Location = new System.Drawing.Point(259, 19); this.domainIP.Name = "domainIP"; - this.domainIP.Size = new System.Drawing.Size(71, 18); + this.domainIP.Size = new System.Drawing.Size(47, 12); this.domainIP.TabIndex = 7; this.domainIP.Text = "0.0.0.0"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(320, 28); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(213, 19); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(71, 18); + this.label2.Size = new System.Drawing.Size(47, 12); this.label2.TabIndex = 6; this.label2.Text = "域名IP:"; // // localIP // this.localIP.AutoSize = true; - this.localIP.Location = new System.Drawing.Point(86, 28); - this.localIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.localIP.Location = new System.Drawing.Point(57, 19); this.localIP.Name = "localIP"; - this.localIP.Size = new System.Drawing.Size(71, 18); + this.localIP.Size = new System.Drawing.Size(47, 12); this.localIP.TabIndex = 5; this.localIP.Text = "0.0.0.0"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(8, 28); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(5, 19); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(80, 18); + this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 4; this.label1.Text = "WAN口IP:"; // @@ -559,31 +557,27 @@ this.groupBox_setWanIp.Controls.Add(this.comboBox_whatIsUrl); this.groupBox_setWanIp.Controls.Add(this.button_whatIsTest); this.groupBox_setWanIp.Controls.Add(this.label14); - this.groupBox_setWanIp.Location = new System.Drawing.Point(18, 70); - this.groupBox_setWanIp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox_setWanIp.Location = new System.Drawing.Point(12, 47); this.groupBox_setWanIp.Name = "groupBox_setWanIp"; - this.groupBox_setWanIp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox_setWanIp.Size = new System.Drawing.Size(302, 202); + this.groupBox_setWanIp.Size = new System.Drawing.Size(201, 135); this.groupBox_setWanIp.TabIndex = 10; this.groupBox_setWanIp.TabStop = false; this.groupBox_setWanIp.Text = "WAN口IP设置"; // // maskedTextBox_setIP // - this.maskedTextBox_setIP.Location = new System.Drawing.Point(10, 150); - this.maskedTextBox_setIP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.maskedTextBox_setIP.Location = new System.Drawing.Point(7, 100); this.maskedTextBox_setIP.Mask = "000.000.000.000"; this.maskedTextBox_setIP.Name = "maskedTextBox_setIP"; this.maskedTextBox_setIP.PromptChar = ' '; - this.maskedTextBox_setIP.Size = new System.Drawing.Size(157, 28); + this.maskedTextBox_setIP.Size = new System.Drawing.Size(106, 21); this.maskedTextBox_setIP.TabIndex = 20; // // button_setIP // - this.button_setIP.Location = new System.Drawing.Point(178, 148); - this.button_setIP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button_setIP.Location = new System.Drawing.Point(119, 99); this.button_setIP.Name = "button_setIP"; - this.button_setIP.Size = new System.Drawing.Size(114, 34); + this.button_setIP.Size = new System.Drawing.Size(76, 23); this.button_setIP.TabIndex = 19; this.button_setIP.Text = "手工指定IP"; this.button_setIP.UseVisualStyleBackColor = true; @@ -595,19 +589,17 @@ this.comboBox_whatIsUrl.Items.AddRange(new object[] { "http://whatismyip.akamai.com/", "http://www.net.cn/static/customercare/yourip.asp"}); - this.comboBox_whatIsUrl.Location = new System.Drawing.Point(9, 62); - this.comboBox_whatIsUrl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.comboBox_whatIsUrl.Location = new System.Drawing.Point(6, 41); this.comboBox_whatIsUrl.Name = "comboBox_whatIsUrl"; - this.comboBox_whatIsUrl.Size = new System.Drawing.Size(282, 26); + this.comboBox_whatIsUrl.Size = new System.Drawing.Size(189, 20); this.comboBox_whatIsUrl.TabIndex = 18; this.comboBox_whatIsUrl.Text = "http://whatismyip.akamai.com/"; // // button_whatIsTest // - this.button_whatIsTest.Location = new System.Drawing.Point(9, 99); - this.button_whatIsTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button_whatIsTest.Location = new System.Drawing.Point(6, 66); this.button_whatIsTest.Name = "button_whatIsTest"; - this.button_whatIsTest.Size = new System.Drawing.Size(284, 34); + this.button_whatIsTest.Size = new System.Drawing.Size(189, 23); this.button_whatIsTest.TabIndex = 17; this.button_whatIsTest.Text = "获取WAN口IP"; this.button_whatIsTest.UseVisualStyleBackColor = true; @@ -616,53 +608,17 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(10, 33); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(7, 22); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(89, 18); + this.label14.Size = new System.Drawing.Size(59, 12); this.label14.TabIndex = 16; this.label14.Text = "查询网址:"; // - // textBox_TTL - // - this.textBox_TTL.Location = new System.Drawing.Point(98, 181); - this.textBox_TTL.Name = "textBox_TTL"; - this.textBox_TTL.Size = new System.Drawing.Size(54, 28); - this.textBox_TTL.TabIndex = 15; - this.textBox_TTL.Text = "600"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(12, 186); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(71, 18); - this.label13.TabIndex = 16; - this.label13.Text = "TTL(秒)"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(209, 62); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(44, 18); - this.label15.TabIndex = 9; - this.label15.Text = "TTL:"; - // - // label_TTL - // - this.label_TTL.AutoSize = true; - this.label_TTL.Location = new System.Drawing.Point(243, 62); - this.label_TTL.Name = "label_TTL"; - this.label_TTL.Size = new System.Drawing.Size(62, 18); - this.label_TTL.TabIndex = 10; - this.label_TTL.Text = ""; - // // mainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(656, 677); + this.ClientSize = new System.Drawing.Size(437, 451); this.Controls.Add(this.groupBox_setWanIp); this.Controls.Add(this.groupBox_netstate); this.Controls.Add(this.textBox_log); @@ -671,7 +627,6 @@ this.Controls.Add(this.timeSetGroup); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "mainForm"; this.Text = "AliDDNS"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.mainForm_FormClosing); diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/main.cs b/net.nutcore.aliddns/net.nutcore.aliddns/main.cs index 8c6ecaf..6c6c0b9 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/main.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/main.cs @@ -17,6 +17,7 @@ namespace net.nutcore.aliddns { public partial class mainForm : Form { + public static bool checkUpdate; static IClientProfile clientProfile; static DefaultAcsClient client; @@ -91,6 +92,20 @@ namespace net.nutcore.aliddns //读取设置文件config.xml if(readConfigFile()) { + string ExePath = System.AppDomain.CurrentDomain.BaseDirectory; + string update = ExePath + "update.exe"; + if(checkUpdate == true) + { + if (!File.Exists(update)) + { + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "版本检测程序update.exe未找到，跳过版本检测！ " + "\r\n"); + } + else + { + //执行update.exe + } + } + //窗体根据参数判断是否最小化驻留系统托盘 if (checkBox_minimized.Checked == true) { @@ -136,12 +151,13 @@ namespace net.nutcore.aliddns try { //Create xml object - XmlDocument xmlDOC = new XmlDocument(); string ExePath = System.AppDomain.CurrentDomain.BaseDirectory; string config_file = ExePath + "aliddns_config.xml"; + XmlDocument xmlDOC = new XmlDocument(); xmlDOC.Load(config_file); - XmlNodeReader readXML = new XmlNodeReader(xmlDOC); - XmlNodeList nodes = xmlDOC.SelectSingleNode("Config").ChildNodes; //读取config节点下所有元素 + //XmlNodeReader readXML = new XmlNodeReader(xmlDOC); + //textBox_log.AppendText(System.DateTime.Now.ToString() + " DEBUG: " + readXML.Value + "\r\n"); //显示读取内容，用于调试DEBUG。 + XmlNodeList nodes = xmlDOC.SelectSingleNode("configuration").ChildNodes; //读取config节点下所有元素 /* for (int i = 0; i < nodes.Count; i++) { @@ -181,6 +197,8 @@ namespace net.nutcore.aliddns else checkBox_logAutoSave.Checked = false; textBox_TTL.Text = nodes[10].InnerText; + if (nodes[11].InnerText == "On") checkUpdate = true; + else checkUpdate = false; textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "设置文件读取成功！" + "\r\n"); return true; @@ -212,7 +230,7 @@ namespace net.nutcore.aliddns textWriter.WriteComment("AlidnsAutoCheckTool"); textWriter.WriteComment("Version:Beta 1.0"); //Start config file - textWriter.WriteStartElement("Config"); //设置项目开始 + textWriter.WriteStartElement("configuration"); //设置项目开始 textWriter.WriteStartElement("AccessKeyID", ""); textWriter.WriteString(accessKeyId_encrypt); diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj b/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj index a135b3d..05ba53f 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj +++ b/net.nutcore.aliddns/net.nutcore.aliddns/net.nutcore.aliddns.csproj @@ -60,6 +60,7 @@ + diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt index ec31563..068fa1a 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt +++ b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt @@ -1,3 +1,6 @@ +v3.8.3.0 +1Զ⹦ܡ2޸BUG + v3.8.2.1 1ӽɫȨ޼⡣2๦־