diff --git a/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/ScanControlViewModel.cs b/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/ScanControlViewModel.cs index 0bbf742..47472ba 100644 --- a/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/ScanControlViewModel.cs +++ b/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/ScanControlViewModel.cs @@ -111,11 +111,11 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels throw new ObjectDisposedException(nameof(ScanControlViewModel)); - //if (SerialConfigs.Current != null) - //{ - // comName = SerialConfigs.Current.ComName ?? string.Empty; - // baudRate = SerialConfigs.Current.BaudRate ?? 9600; - //} + if (SerialConfigs.Current != null) + { + comName = SerialConfigs.Current.ComName ?? string.Empty; + baudRate = SerialConfigs.Current.BaudRate ?? 9600; + } _eventAggregator.GetEvent().Publish($"串口扫码枪初始化……串口:{comName} 波特率:{baudRate}"); diff --git a/RIZO_Application/RIZO_Application.Infrastructure/Util/ScanHelper/ComScanHelper.cs b/RIZO_Application/RIZO_Application.Infrastructure/Util/ScanHelper/ComScanHelper.cs index 0e1333e..93cf573 100644 --- a/RIZO_Application/RIZO_Application.Infrastructure/Util/ScanHelper/ComScanHelper.cs +++ b/RIZO_Application/RIZO_Application.Infrastructure/Util/ScanHelper/ComScanHelper.cs @@ -63,6 +63,11 @@ namespace RIZO_Helper.Tools _serialPort.DataReceived += OnSerialDataReceived; return true; } + catch (InvalidOperationException ex) + { + Debug.WriteLine($"打开串口 {_serialPort.PortName} 失败: {ex.Message}"); + return false; + } catch (OperationCanceledException) when (_disposeCts.IsCancellationRequested) { return false;