fix: 修复发送文件时进度条显示异常的问题（对串行端口实现异步读写）

Signed-off-by: Leven <levenchn@163.com>
leven99 · Oct 14, 2019 · 422bc40 · 422bc40
1 parent 3bf1aaf
commit 422bc40
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/ViewModels/MainWindowVM.cs b/ViewModels/MainWindowVM.cs
@@ -743,9 +743,9 @@ public void InitAutoSendTimer()
             AutoSendDispatcherTimer.Tick += AutoSendDispatcherTimer_Tick;
         }
 
-        public void AutoSendDispatcherTimer_Tick(object sender, EventArgs e)
+        public async void AutoSendDispatcherTimer_Tick(object sender, EventArgs e)
         {
-            Send();
+            await SendAsync().ConfigureAwait(false);
         }
 
         public void StartAutoSendTimer(int interval)
@@ -763,7 +763,7 @@ public void StopAutoSendTimer()
         #endregion
 
         #region 发送
-        public void Send()
+        public async Task SendAsync()
         {
             if (SPserialPort == null)
             {
@@ -794,13 +794,14 @@ public void Send()
                         sendData[SendCount++] = byte.Parse(tmp, NumberStyles.AllowHexSpecifier, cultureInfo);
                     }
 
-                    SPserialPort.Write(sendData, 0, SendCount);
+                    await SPserialPort.BaseStream.WriteAsync(sendData, 0, SendCount).ConfigureAwait(false);
 
                 }
                 else
                 {
                     SendCount = SPserialPort.Encoding.GetByteCount(SendModel.SendData);
-                    SPserialPort.Write(SPserialPort.Encoding.GetBytes(SendModel.SendData), 0, SendCount);
+                    await SPserialPort.BaseStream.WriteAsync(SPserialPort.Encoding.GetBytes(SendModel.SendData), 0, SendCount)
+                        .ConfigureAwait(false);
                 }
 
                 if (SendModel.NonesEnable)
@@ -809,17 +810,20 @@ public void Send()
                 }
                 else if (SendModel.CrEnable)
                 {
-                    SPserialPort.Write(SPserialPort.Encoding.GetBytes("\r"), 0, 1);
+                    await SPserialPort.BaseStream.WriteAsync(SPserialPort.Encoding.GetBytes("\r"), 0, 1)
+                        .ConfigureAwait(false);
                     SendModel.SendDataCount += (SendCount + 1);
                 }
                 else if (SendModel.LfEnable)
                 {
-                    SPserialPort.Write(SPserialPort.Encoding.GetBytes("\n"), 0, 1);
+                    await SPserialPort.BaseStream.WriteAsync(SPserialPort.Encoding.GetBytes("\n"), 0, 1)
+                        .ConfigureAwait(false);
                     SendModel.SendDataCount += (SendCount + 1);
                 }
                 else if (SendModel.CrLfEnable)
                 {
-                    SPserialPort.Write(SPserialPort.Encoding.GetBytes("\r\n"), 0, 2);
+                    await SPserialPort.BaseStream.WriteAsync(SPserialPort.Encoding.GetBytes("\r\n"), 0, 2)
+                        .ConfigureAwait(false);
                     SendModel.SendDataCount += (SendCount + 2);
                 }
             }
@@ -831,7 +835,7 @@ public void Send()
         #endregion
 
         #region 发送文件
-        public void SendFile()
+        public async Task SendFileAsync()
         {
             if (SPserialPort == null)
             {
@@ -877,7 +881,8 @@ public void SendFile()
                         DepictInfo = string.Format(cultureInfo, "文件正在发送......");
                         HelpModel.StatusBarProgressBarIsIndeterminate = true;
 
-                        SPserialPort.Write(SPserialPort.Encoding.GetBytes(fileContent), 0, SendCount);
+                        await SPserialPort.BaseStream.WriteAsync(SPserialPort.Encoding.GetBytes(fileContent), 0, SendCount)
+                            .ConfigureAwait(false);
 
                         HelpModel.StatusBarProgressBarIsIndeterminate = false;
                         DepictInfo = string.Format(cultureInfo, "文件发送完毕");
@@ -941,14 +946,14 @@ public void ClearCount()
         #endregion
 
         #region 数据接收事件实现
-        public void SerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
+        public async void SerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
         {
             SerialPort _SerialPort = (SerialPort)sender;
 
             int _bytesToRead = _SerialPort.BytesToRead;
             byte[] recvData = new byte[_bytesToRead];
 
-            _SerialPort.Read(recvData, 0, _bytesToRead);
+            await _SerialPort.BaseStream.ReadAsync(recvData, 0, _bytesToRead).ConfigureAwait(false);
 
             if (RecvModel.EnableRecv)
             {

diff --git a/Views/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
@@ -233,16 +233,16 @@ private void OpenCloseSP(object sender, RoutedEventArgs e)
         #endregion
 
         #region 发送
-        private void Send(object sender, RoutedEventArgs e)
+        private async void Send(object sender, RoutedEventArgs e)
         {
-            mainWindowViewModel.Send();
+            await mainWindowViewModel.SendAsync().ConfigureAwait(false);
         }
         #endregion
 
         #region 发送文件
-        private void SendFile(object sender, RoutedEventArgs e)
+        private async void SendFile(object sender, RoutedEventArgs e)
         {
-            mainWindowViewModel.SendFile();
+            await mainWindowViewModel.SendFileAsync().ConfigureAwait(false);
         }
         #endregion