微调串口监听页面

chenxuuu · Jun 24, 2021 · 14f115b · 14f115b
1 parent b127dad
commit 14f115b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/changlog/autoUpdate.xml b/changlog/autoUpdate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>1.0.6.2</version>
+    <version>1.0.6.3</version>
     <url>https://llcom.papapoi.com/llcom.zip</url>
     <changelog>https://llcom.papapoi.com/changelog.html</changelog>
     <mandatory mode="1">true</mandatory>

diff --git a/changlog/index.html b/changlog/index.html
@@ -11,6 +11,12 @@
 
 > 欢迎加入交流群：`931546484`
 
+## LLCOM 1.0.6.3
+
+- 微调串口监听页面
+
+---
+
 ## LLCOM 1.0.6.1
 
 - 增加：串口监听功能

diff --git a/llcom/DefaultFiles/core_script/serial_monitor.dll b/llcom/DefaultFiles/core_script/serial_monitor.dll
diff --git a/llcom/Pages/SerialMonitorPage.xaml.cs b/llcom/Pages/SerialMonitorPage.xaml.cs
@@ -140,6 +140,7 @@ private void MonitorButton_Click(object sender, RoutedEventArgs e)
 
         private void Refresh()
         {
+            string lastP = PidComboBox.Text;
             PidComboBox.Items.Clear();
             var sl = new List<string>();
             foreach (var p in Process.GetProcesses())
@@ -154,16 +155,27 @@ private void Refresh()
             foreach(var i in sl)
                 PidComboBox.Items.Add(i);
             if (PidComboBox.Items.Count > 0)
-                PidComboBox.SelectedIndex = 0;
+            {
+                if (!string.IsNullOrWhiteSpace(lastP) && sl.Contains(lastP))
+                    PidComboBox.Text = lastP;
+                else
+                    PidComboBox.SelectedIndex = 0;
+            }
 
+            lastP = SerialPortComboBox.Text;
             SerialPortComboBox.Items.Clear();
             foreach(var p in SerialPort.GetPortNames())
             {
                 if(p.IndexOf("COM") == 0)
                     SerialPortComboBox.Items.Add(p);
             }
             if (SerialPortComboBox.Items.Count > 0)
-                SerialPortComboBox.SelectedIndex = 0;
+            {
+                if (!string.IsNullOrWhiteSpace(lastP) && SerialPortComboBox.Items.Contains(lastP))
+                    SerialPortComboBox.Text = lastP;
+                else
+                    SerialPortComboBox.SelectedIndex = 0;
+            }
         }
     }
 }
diff --git a/llcom/Properties/AssemblyInfo.cs b/llcom/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.2")]
-[assembly: AssemblyFileVersion("1.0.6.2")]
+[assembly: AssemblyVersion("1.0.6.3")]
+[assembly: AssemblyFileVersion("1.0.6.3")]
 [assembly: NeutralResourcesLanguage("zh-CN")]