diff --git a/.vs/SerialAssistant/v15/.suo b/.vs/SerialAssistant/v15/.suo index e3781f1..592ffe8 100644 Binary files a/.vs/SerialAssistant/v15/.suo and b/.vs/SerialAssistant/v15/.suo differ diff --git a/.vs/SerialAssistant/v15/Server/sqlite3/storage.ide b/.vs/SerialAssistant/v15/Server/sqlite3/storage.ide index c4393ff..27d249e 100644 Binary files a/.vs/SerialAssistant/v15/Server/sqlite3/storage.ide and b/.vs/SerialAssistant/v15/Server/sqlite3/storage.ide differ diff --git a/SerialAssistant/Form1.Designer.cs b/SerialAssistant/Form1.Designer.cs index aabc556..b4baccd 100644 --- a/SerialAssistant/Form1.Designer.cs +++ b/SerialAssistant/Form1.Designer.cs @@ -333,6 +333,7 @@ private void InitializeComponent() // checkBox2 // this.checkBox2.AutoSize = true; + this.checkBox2.Enabled = false; this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox2.Location = new System.Drawing.Point(13, 66); this.checkBox2.Name = "checkBox2"; @@ -369,22 +370,23 @@ private void InitializeComponent() // panel4 // this.panel4.AutoScroll = true; + this.panel4.AutoSize = true; this.panel4.Controls.Add(this.textBox_receive); this.panel4.Location = new System.Drawing.Point(189, 13); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(436, 337); + this.panel4.Size = new System.Drawing.Size(439, 340); this.panel4.TabIndex = 3; // // textBox_receive // this.textBox_receive.BackColor = System.Drawing.SystemColors.ButtonHighlight; this.textBox_receive.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox_receive.Location = new System.Drawing.Point(1, 0); + this.textBox_receive.Location = new System.Drawing.Point(1, -1); this.textBox_receive.Multiline = true; this.textBox_receive.Name = "textBox_receive"; this.textBox_receive.ReadOnly = true; this.textBox_receive.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox_receive.Size = new System.Drawing.Size(432, 337); + this.textBox_receive.Size = new System.Drawing.Size(435, 338); this.textBox_receive.TabIndex = 0; this.textBox_receive.TextChanged += new System.EventHandler(this.textBox1_TextChanged); // @@ -413,6 +415,8 @@ private void InitializeComponent() // // textBox_send // + this.textBox_send.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.textBox_send.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.textBox_send.Location = new System.Drawing.Point(-1, -2); this.textBox_send.Multiline = true; @@ -428,9 +432,10 @@ private void InitializeComponent() // label6 // this.label6.AutoSize = true; + this.label6.Dock = System.Windows.Forms.DockStyle.Left; this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.Red; - this.label6.Location = new System.Drawing.Point(3, 0); + this.label6.Location = new System.Drawing.Point(0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(90, 21); this.label6.TabIndex = 0; @@ -458,26 +463,29 @@ private void InitializeComponent() // // panel6 // + this.panel6.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.panel6.Controls.Add(this.label9); this.panel6.Controls.Add(this.label7); this.panel6.Controls.Add(this.label8); this.panel6.Controls.Add(this.label6); - this.panel6.Location = new System.Drawing.Point(3, 461); + this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel6.Location = new System.Drawing.Point(0, 461); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(619, 25); + this.panel6.Size = new System.Drawing.Size(625, 25); this.panel6.TabIndex = 7; // // label9 // this.label9.AutoSize = true; + this.label9.Dock = System.Windows.Forms.DockStyle.Right; this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.ForeColor = System.Drawing.Color.SeaGreen; - this.label9.Location = new System.Drawing.Point(544, 0); + this.label9.Location = new System.Drawing.Point(548, 0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(73, 21); this.label9.TabIndex = 3; - this.label9.Text = "@V1.1.0"; + this.label9.Text = "@V1.2.0"; // // timer1 // @@ -512,6 +520,7 @@ private void InitializeComponent() this.panel6.ResumeLayout(false); this.panel6.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/SerialAssistant/Form1.cs b/SerialAssistant/Form1.cs index 087b5ab..bb05827 100644 --- a/SerialAssistant/Form1.cs +++ b/SerialAssistant/Form1.cs @@ -108,6 +108,7 @@ private void button1_Click(object sender, EventArgs e) label6.Text = "串口已打开"; label6.ForeColor = Color.Green; button2.Enabled = true; //使能发送按钮 + checkBox2.Enabled = true; } } @@ -130,6 +131,7 @@ private void button1_Click(object sender, EventArgs e) comboBox3.Enabled = true; comboBox4.Enabled = true; comboBox5.Enabled = true; + checkBox2.Enabled = false; } } @@ -216,6 +218,7 @@ private void button2_Click(object sender, EventArgs e) comboBox3.Enabled = true; comboBox4.Enabled = true; comboBox5.Enabled = true; + checkBox2.Enabled = false; } } diff --git a/SerialAssistant/Form1.resx b/SerialAssistant/Form1.resx index 6315655..4049fc3 100644 --- a/SerialAssistant/Form1.resx +++ b/SerialAssistant/Form1.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + 17, 17 diff --git a/SerialAssistant/Properties/AssemblyInfo.cs b/SerialAssistant/Properties/AssemblyInfo.cs index 567341c..f04a8a5 100644 --- a/SerialAssistant/Properties/AssemblyInfo.cs +++ b/SerialAssistant/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ // // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +// [assembly: AssemblyVersion("1.2.*")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] diff --git a/SerialAssistant/bin/Debug/SerialAssistant.exe b/SerialAssistant/bin/Debug/SerialAssistant.exe index 0373751..a3055cd 100644 Binary files a/SerialAssistant/bin/Debug/SerialAssistant.exe and b/SerialAssistant/bin/Debug/SerialAssistant.exe differ diff --git a/SerialAssistant/bin/Debug/SerialAssistant.pdb b/SerialAssistant/bin/Debug/SerialAssistant.pdb index 16a60d0..8eea48e 100644 Binary files a/SerialAssistant/bin/Debug/SerialAssistant.pdb and b/SerialAssistant/bin/Debug/SerialAssistant.pdb differ diff --git a/SerialAssistant/obj/Debug/SerialAssistant.csproj.GenerateResource.cache b/SerialAssistant/obj/Debug/SerialAssistant.csproj.GenerateResource.cache index 5fcb5ac..a8db44b 100644 Binary files a/SerialAssistant/obj/Debug/SerialAssistant.csproj.GenerateResource.cache and b/SerialAssistant/obj/Debug/SerialAssistant.csproj.GenerateResource.cache differ diff --git a/SerialAssistant/obj/Debug/SerialAssistant.exe b/SerialAssistant/obj/Debug/SerialAssistant.exe index 0373751..a3055cd 100644 Binary files a/SerialAssistant/obj/Debug/SerialAssistant.exe and b/SerialAssistant/obj/Debug/SerialAssistant.exe differ diff --git a/SerialAssistant/obj/Debug/SerialAssistant.pdb b/SerialAssistant/obj/Debug/SerialAssistant.pdb index 16a60d0..8eea48e 100644 Binary files a/SerialAssistant/obj/Debug/SerialAssistant.pdb and b/SerialAssistant/obj/Debug/SerialAssistant.pdb differ