更新V3.1，增加角度编辑功能，下载超时功能

Mculover666 · Jun 14, 2018 · 0501427 · 0501427
1 parent c14b202
commit 0501427
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 11 deletions.
diff --git a/.vs/SerialAssistant/v15/.suo b/.vs/SerialAssistant/v15/.suo
diff --git a/.vs/SerialAssistant/v15/Server/sqlite3/storage.ide b/.vs/SerialAssistant/v15/Server/sqlite3/storage.ide
diff --git a/SerialAssistant/Form1.Designer.cs b/SerialAssistant/Form1.Designer.cs
diff --git 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
@@ -117,6 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="panel4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="textBox_send.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="textBox_send.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

diff --git 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
diff --git a/SerialAssistant/bin/Debug/SerialAssistant.pdb b/SerialAssistant/bin/Debug/SerialAssistant.pdb
diff --git a/SerialAssistant/obj/Debug/SerialAssistant.csproj.GenerateResource.cache b/SerialAssistant/obj/Debug/SerialAssistant.csproj.GenerateResource.cache
diff --git a/SerialAssistant/obj/Debug/SerialAssistant.exe b/SerialAssistant/obj/Debug/SerialAssistant.exe
diff --git a/SerialAssistant/obj/Debug/SerialAssistant.pdb b/SerialAssistant/obj/Debug/SerialAssistant.pdb