diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 8066527..2d44977 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Windows; using System.Windows.Media; using System.Windows.Shapes; using System.Windows.Threading; +using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Util; using GalaSoft.MvvmLight.Messaging; @@ -26,13 +28,27 @@ Interval = TimeSpan.FromSeconds(1) }; + private static readonly Lazy LazyDataBase = + new Lazy(() => new DataBaseManager()); + public CheckResponseDialog() { InitializeComponent(); + var today = DateTime.Now.ToString("yyyyMMdd"); + var configModel = LazyDataBase.Value.Table() + .Where(x => x.Date == today) + .OrderBy(x => x.Date) + .LastOrDefault() ?? new CorrelatorConfigModel + { Date = today, Pipe = 1, LocateTimes = 1, ListenTimes = 1 }; + + //如果配置里面的日期相同,则取配置里面的Pipe作为index,如果配置里面的日期不相同,则默认index=1 + var pipeIndex = configModel.Date.Equals(today) ? configModel.Pipe : 1; + var locateDataDir = DirectoryManager.GetLocateDataDir(pipeIndex); + InitDot(); - InitEvent(); + InitEvent(locateDataDir); _redResponseTimer.Tick += delegate { @@ -90,7 +106,7 @@ } } - private void InitEvent() + private void InitEvent(string locateDataDir) { GoBackButton.Click += delegate { @@ -143,7 +159,8 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List()); //保存原始数据 - FlowStatus.RedSensorOriginalResp.SaveSensorResponse(DevCode.Dev1); + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev1}.txt"; + fileName.SaveSensorResponse(FlowStatus.RedSensorOriginalResp); //处理数据 var tags = new List(); @@ -196,8 +213,9 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List()); //保存原始数据 - FlowStatus.BlueSensorOriginalResp.SaveSensorResponse(DevCode.Dev2); - + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev2}.txt"; + fileName.SaveSensorResponse(FlowStatus.BlueSensorOriginalResp); + //处理数据 var tags = new List(); foreach (var list in FlowStatus.BlueSensorResponseTags) diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 8066527..2d44977 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Windows; using System.Windows.Media; using System.Windows.Shapes; using System.Windows.Threading; +using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Util; using GalaSoft.MvvmLight.Messaging; @@ -26,13 +28,27 @@ Interval = TimeSpan.FromSeconds(1) }; + private static readonly Lazy LazyDataBase = + new Lazy(() => new DataBaseManager()); + public CheckResponseDialog() { InitializeComponent(); + var today = DateTime.Now.ToString("yyyyMMdd"); + var configModel = LazyDataBase.Value.Table() + .Where(x => x.Date == today) + .OrderBy(x => x.Date) + .LastOrDefault() ?? new CorrelatorConfigModel + { Date = today, Pipe = 1, LocateTimes = 1, ListenTimes = 1 }; + + //如果配置里面的日期相同,则取配置里面的Pipe作为index,如果配置里面的日期不相同,则默认index=1 + var pipeIndex = configModel.Date.Equals(today) ? configModel.Pipe : 1; + var locateDataDir = DirectoryManager.GetLocateDataDir(pipeIndex); + InitDot(); - InitEvent(); + InitEvent(locateDataDir); _redResponseTimer.Tick += delegate { @@ -90,7 +106,7 @@ } } - private void InitEvent() + private void InitEvent(string locateDataDir) { GoBackButton.Click += delegate { @@ -143,7 +159,8 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List()); //保存原始数据 - FlowStatus.RedSensorOriginalResp.SaveSensorResponse(DevCode.Dev1); + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev1}.txt"; + fileName.SaveSensorResponse(FlowStatus.RedSensorOriginalResp); //处理数据 var tags = new List(); @@ -196,8 +213,9 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List()); //保存原始数据 - FlowStatus.BlueSensorOriginalResp.SaveSensorResponse(DevCode.Dev2); - + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev2}.txt"; + fileName.SaveSensorResponse(FlowStatus.BlueSensorOriginalResp); + //处理数据 var tags = new List(); foreach (var list in FlowStatus.BlueSensorResponseTags) diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 5047c5f..44d58f5 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -391,13 +391,11 @@ } /// - /// 保存传感器上传的原始数据 + /// 清空文件夹 /// - /// - /// - public static void SaveSensorResponse(this List response, string devCode) + /// + public static void ClearDirFiles(this string rootDir) { - var rootDir = DirectoryManager.GetLocateDataDir(short.MaxValue); if (Directory.GetDirectories(rootDir).Length > 0 || Directory.GetFiles(rootDir).Length > 0) { //防止数据混乱,存数据之前先将之前发的数据清空 @@ -410,17 +408,15 @@ } } } + } - string fileName; - if (devCode == DevCode.Dev1) - { - fileName = rootDir + "\\原始数据." + DevCode.Dev1 + ".txt"; - } - else - { - fileName = rootDir + "\\原始数据." + DevCode.Dev2 + ".txt"; - } - + /// + /// 保存传感器上传的原始数据 + /// + /// + /// + public static void SaveSensorResponse(this string fileName, List response) + { var builder = new StringBuilder(); for (var i = 0; i < response.Count; i++) { @@ -439,6 +435,37 @@ } /// + /// 保存定位数据 + /// + /// 完整路径 + /// CorrelatorDataModel + public static void SaveLocateData(this string fileName, CorrelatorDataModel it) + { + var builder = new StringBuilder(); + builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n"); + foreach (var d in it.LeftDeviceDataArray) + { + builder.Append(d).Append("\r\n"); + } + + builder.Append("===============").Append("\r\n"); + for (var i = 0; i < it.RightDeviceDataArray.Length; i++) + { + var d = it.RightDeviceDataArray[i]; + if (i == it.RightDeviceDataArray.Length - 1) + { + builder.Append(d); + } + else + { + builder.Append(d).Append("\r\n"); + } + } + + File.AppendAllText(fileName, builder.ToString()); + } + + /// /// 根据PduType获取设备类型 /// /// @@ -543,36 +570,5 @@ streamReader.Close(); return list; } - - /// - /// 保存定位数据 - /// - /// 完整路径 - /// CorrelatorDataModel - public static void SaveLocateData(this string fileName, CorrelatorDataModel it) - { - var builder = new StringBuilder(); - builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n"); - foreach (var d in it.LeftDeviceDataArray) - { - builder.Append(d).Append("\r\n"); - } - - builder.Append("===============").Append("\r\n"); - for (var i = 0; i < it.RightDeviceDataArray.Length; i++) - { - var d = it.RightDeviceDataArray[i]; - if (i == it.RightDeviceDataArray.Length - 1) - { - builder.Append(d); - } - else - { - builder.Append(d).Append("\r\n"); - } - } - - File.AppendAllText(fileName, builder.ToString()); - } } } \ No newline at end of file diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 8066527..2d44977 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Windows; using System.Windows.Media; using System.Windows.Shapes; using System.Windows.Threading; +using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Util; using GalaSoft.MvvmLight.Messaging; @@ -26,13 +28,27 @@ Interval = TimeSpan.FromSeconds(1) }; + private static readonly Lazy LazyDataBase = + new Lazy(() => new DataBaseManager()); + public CheckResponseDialog() { InitializeComponent(); + var today = DateTime.Now.ToString("yyyyMMdd"); + var configModel = LazyDataBase.Value.Table() + .Where(x => x.Date == today) + .OrderBy(x => x.Date) + .LastOrDefault() ?? new CorrelatorConfigModel + { Date = today, Pipe = 1, LocateTimes = 1, ListenTimes = 1 }; + + //如果配置里面的日期相同,则取配置里面的Pipe作为index,如果配置里面的日期不相同,则默认index=1 + var pipeIndex = configModel.Date.Equals(today) ? configModel.Pipe : 1; + var locateDataDir = DirectoryManager.GetLocateDataDir(pipeIndex); + InitDot(); - InitEvent(); + InitEvent(locateDataDir); _redResponseTimer.Tick += delegate { @@ -90,7 +106,7 @@ } } - private void InitEvent() + private void InitEvent(string locateDataDir) { GoBackButton.Click += delegate { @@ -143,7 +159,8 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List()); //保存原始数据 - FlowStatus.RedSensorOriginalResp.SaveSensorResponse(DevCode.Dev1); + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev1}.txt"; + fileName.SaveSensorResponse(FlowStatus.RedSensorOriginalResp); //处理数据 var tags = new List(); @@ -196,8 +213,9 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List()); //保存原始数据 - FlowStatus.BlueSensorOriginalResp.SaveSensorResponse(DevCode.Dev2); - + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev2}.txt"; + fileName.SaveSensorResponse(FlowStatus.BlueSensorOriginalResp); + //处理数据 var tags = new List(); foreach (var list in FlowStatus.BlueSensorResponseTags) diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 5047c5f..44d58f5 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -391,13 +391,11 @@ } /// - /// 保存传感器上传的原始数据 + /// 清空文件夹 /// - /// - /// - public static void SaveSensorResponse(this List response, string devCode) + /// + public static void ClearDirFiles(this string rootDir) { - var rootDir = DirectoryManager.GetLocateDataDir(short.MaxValue); if (Directory.GetDirectories(rootDir).Length > 0 || Directory.GetFiles(rootDir).Length > 0) { //防止数据混乱,存数据之前先将之前发的数据清空 @@ -410,17 +408,15 @@ } } } + } - string fileName; - if (devCode == DevCode.Dev1) - { - fileName = rootDir + "\\原始数据." + DevCode.Dev1 + ".txt"; - } - else - { - fileName = rootDir + "\\原始数据." + DevCode.Dev2 + ".txt"; - } - + /// + /// 保存传感器上传的原始数据 + /// + /// + /// + public static void SaveSensorResponse(this string fileName, List response) + { var builder = new StringBuilder(); for (var i = 0; i < response.Count; i++) { @@ -439,6 +435,37 @@ } /// + /// 保存定位数据 + /// + /// 完整路径 + /// CorrelatorDataModel + public static void SaveLocateData(this string fileName, CorrelatorDataModel it) + { + var builder = new StringBuilder(); + builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n"); + foreach (var d in it.LeftDeviceDataArray) + { + builder.Append(d).Append("\r\n"); + } + + builder.Append("===============").Append("\r\n"); + for (var i = 0; i < it.RightDeviceDataArray.Length; i++) + { + var d = it.RightDeviceDataArray[i]; + if (i == it.RightDeviceDataArray.Length - 1) + { + builder.Append(d); + } + else + { + builder.Append(d).Append("\r\n"); + } + } + + File.AppendAllText(fileName, builder.ToString()); + } + + /// /// 根据PduType获取设备类型 /// /// @@ -543,36 +570,5 @@ streamReader.Close(); return list; } - - /// - /// 保存定位数据 - /// - /// 完整路径 - /// CorrelatorDataModel - public static void SaveLocateData(this string fileName, CorrelatorDataModel it) - { - var builder = new StringBuilder(); - builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n"); - foreach (var d in it.LeftDeviceDataArray) - { - builder.Append(d).Append("\r\n"); - } - - builder.Append("===============").Append("\r\n"); - for (var i = 0; i < it.RightDeviceDataArray.Length; i++) - { - var d = it.RightDeviceDataArray[i]; - if (i == it.RightDeviceDataArray.Length - 1) - { - builder.Append(d); - } - else - { - builder.Append(d).Append("\r\n"); - } - } - - File.AppendAllText(fileName, builder.ToString()); - } } } \ No newline at end of file diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 6474341..9ad8733 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -61,7 +61,7 @@ var pduTypeBytes = new byte[2]; Array.Copy(receiveData, 13, pduTypeBytes, 0, 2); var operateType = pduTypeBytes.GetOpeTypeByPdu(); - + var tagBytes = new byte[receiveData.Length - 18]; Array.Copy(receiveData, 16, tagBytes, 0, receiveData.Length - 18); var tags = tagBytes.GetTags(); @@ -353,7 +353,7 @@ var listenDataDir = DirectoryManager.GetListenDir(); var listenTimes = configModel.LocateTimes; - var fileName = listenDataDir + "\\听音数据" + today + "." + pipeIndex + "." + listenTimes + ".txt"; + var fileName = $"{listenDataDir}\\听音数据{today}.{pipeIndex}.{listenTimes}.txt"; var fs = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite); diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 8066527..2d44977 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Windows; using System.Windows.Media; using System.Windows.Shapes; using System.Windows.Threading; +using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Util; using GalaSoft.MvvmLight.Messaging; @@ -26,13 +28,27 @@ Interval = TimeSpan.FromSeconds(1) }; + private static readonly Lazy LazyDataBase = + new Lazy(() => new DataBaseManager()); + public CheckResponseDialog() { InitializeComponent(); + var today = DateTime.Now.ToString("yyyyMMdd"); + var configModel = LazyDataBase.Value.Table() + .Where(x => x.Date == today) + .OrderBy(x => x.Date) + .LastOrDefault() ?? new CorrelatorConfigModel + { Date = today, Pipe = 1, LocateTimes = 1, ListenTimes = 1 }; + + //如果配置里面的日期相同,则取配置里面的Pipe作为index,如果配置里面的日期不相同,则默认index=1 + var pipeIndex = configModel.Date.Equals(today) ? configModel.Pipe : 1; + var locateDataDir = DirectoryManager.GetLocateDataDir(pipeIndex); + InitDot(); - InitEvent(); + InitEvent(locateDataDir); _redResponseTimer.Tick += delegate { @@ -90,7 +106,7 @@ } } - private void InitEvent() + private void InitEvent(string locateDataDir) { GoBackButton.Click += delegate { @@ -143,7 +159,8 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev1, new List()); //保存原始数据 - FlowStatus.RedSensorOriginalResp.SaveSensorResponse(DevCode.Dev1); + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev1}.txt"; + fileName.SaveSensorResponse(FlowStatus.RedSensorOriginalResp); //处理数据 var tags = new List(); @@ -196,8 +213,9 @@ CommandSender.SendDataCheckResultCmd(SerialPortManager.Get.Sp, DevCode.Dev2, new List()); //保存原始数据 - FlowStatus.BlueSensorOriginalResp.SaveSensorResponse(DevCode.Dev2); - + var fileName = $"{locateDataDir}\\原始数据.{DevCode.Dev2}.txt"; + fileName.SaveSensorResponse(FlowStatus.BlueSensorOriginalResp); + //处理数据 var tags = new List(); foreach (var list in FlowStatus.BlueSensorResponseTags) diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 5047c5f..44d58f5 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -391,13 +391,11 @@ } /// - /// 保存传感器上传的原始数据 + /// 清空文件夹 /// - /// - /// - public static void SaveSensorResponse(this List response, string devCode) + /// + public static void ClearDirFiles(this string rootDir) { - var rootDir = DirectoryManager.GetLocateDataDir(short.MaxValue); if (Directory.GetDirectories(rootDir).Length > 0 || Directory.GetFiles(rootDir).Length > 0) { //防止数据混乱,存数据之前先将之前发的数据清空 @@ -410,17 +408,15 @@ } } } + } - string fileName; - if (devCode == DevCode.Dev1) - { - fileName = rootDir + "\\原始数据." + DevCode.Dev1 + ".txt"; - } - else - { - fileName = rootDir + "\\原始数据." + DevCode.Dev2 + ".txt"; - } - + /// + /// 保存传感器上传的原始数据 + /// + /// + /// + public static void SaveSensorResponse(this string fileName, List response) + { var builder = new StringBuilder(); for (var i = 0; i < response.Count; i++) { @@ -439,6 +435,37 @@ } /// + /// 保存定位数据 + /// + /// 完整路径 + /// CorrelatorDataModel + public static void SaveLocateData(this string fileName, CorrelatorDataModel it) + { + var builder = new StringBuilder(); + builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n"); + foreach (var d in it.LeftDeviceDataArray) + { + builder.Append(d).Append("\r\n"); + } + + builder.Append("===============").Append("\r\n"); + for (var i = 0; i < it.RightDeviceDataArray.Length; i++) + { + var d = it.RightDeviceDataArray[i]; + if (i == it.RightDeviceDataArray.Length - 1) + { + builder.Append(d); + } + else + { + builder.Append(d).Append("\r\n"); + } + } + + File.AppendAllText(fileName, builder.ToString()); + } + + /// /// 根据PduType获取设备类型 /// /// @@ -543,36 +570,5 @@ streamReader.Close(); return list; } - - /// - /// 保存定位数据 - /// - /// 完整路径 - /// CorrelatorDataModel - public static void SaveLocateData(this string fileName, CorrelatorDataModel it) - { - var builder = new StringBuilder(); - builder.Append(DateTime.Now.ToString(CultureInfo.InvariantCulture)).Append("\r\n"); - foreach (var d in it.LeftDeviceDataArray) - { - builder.Append(d).Append("\r\n"); - } - - builder.Append("===============").Append("\r\n"); - for (var i = 0; i < it.RightDeviceDataArray.Length; i++) - { - var d = it.RightDeviceDataArray[i]; - if (i == it.RightDeviceDataArray.Length - 1) - { - builder.Append(d); - } - else - { - builder.Append(d).Append("\r\n"); - } - } - - File.AppendAllText(fileName, builder.ToString()); - } } } \ No newline at end of file diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 6474341..9ad8733 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -61,7 +61,7 @@ var pduTypeBytes = new byte[2]; Array.Copy(receiveData, 13, pduTypeBytes, 0, 2); var operateType = pduTypeBytes.GetOpeTypeByPdu(); - + var tagBytes = new byte[receiveData.Length - 18]; Array.Copy(receiveData, 16, tagBytes, 0, receiveData.Length - 18); var tags = tagBytes.GetTags(); @@ -353,7 +353,7 @@ var listenDataDir = DirectoryManager.GetListenDir(); var listenTimes = configModel.LocateTimes; - var fileName = listenDataDir + "\\听音数据" + today + "." + pipeIndex + "." + listenTimes + ".txt"; + var fileName = $"{listenDataDir}\\听音数据{today}.{pipeIndex}.{listenTimes}.txt"; var fs = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite); diff --git a/Correlator/ViewModel/HomePageProViewModel.cs b/Correlator/ViewModel/HomePageProViewModel.cs index 61391ae..eb422e1 100644 --- a/Correlator/ViewModel/HomePageProViewModel.cs +++ b/Correlator/ViewModel/HomePageProViewModel.cs @@ -566,8 +566,8 @@ //数据绑定 var snr = Convert.ToDouble(array[0].ToString()); //信噪比 Snr = snr.ToString("0.0") + ":1"; - RedTransmitterDistance = Convert.ToDouble(array[1].ToString()); //距离A - BlueTransmitterDistance = Convert.ToDouble(array[2].ToString()); //距离B + RedTransmitterDistance = Convert.ToInt32(array[1].ToString()); //距离A + BlueTransmitterDistance = Convert.ToInt32(array[2].ToString()); //距离B var maxFreLowOut = Convert.ToInt32(array[6].ToString()); //低频 var maxFreHighOut = Convert.ToInt32(array[7].ToString()); //高频 @@ -577,14 +577,12 @@ Messenger.Default.Send(array, MessengerToken.RenderOscillogram); //保存数据 - var fileName = _locateDataDir + "\\测试数据." + _locateTimes + "." + - DateTime.Now.ToString("HHmmss") + ".txt"; + var fileName = $"{_locateDataDir}\\测试数据.{_locateTimes}.{DateTime.Now.ToString("HHmmss")}.txt"; fileName.SaveLocateData(dataModel); "HomePageViewModel".WriteLog("定位数据路径:" + fileName); //保存了数据之后5s再截图 - _snapShotPath = _locateDataDir + "\\快照." + _locateTimes + "." + - DateTime.Now.ToString("HHmmss") + ".png"; + _snapShotPath = $"{_locateDataDir}\\快照.{_locateTimes}.{DateTime.Now.ToString("HHmmss")}.png"; _snapShotTimer.Start(); _runningTimer.Stop(); @@ -713,23 +711,6 @@ { if (CheckParamLegitimacy()) { - // var fileDialog = new OpenFileDialog - // { - // // 设置默认格式 - // DefaultExt = ".txt", - // Filter = "发射机数据文件(*.txt)|*.txt" - // }; - // var result = fileDialog.ShowDialog(); - // if (result == true) - // { - // var dataFromFile = fileDialog.FileName.ReadFromFile(); - // - // //赋值给缓存,比用消息传递更直接 - // FlowStatus.CorrelatorData = dataFromFile.LocalDataToDataModel(); - // - // Messenger.Default.Send("", MessengerToken.HomePageDeviceData); - // } - var importResponseDialog = new ImportResponseDialog() { Owner = _homePageWindow @@ -743,8 +724,8 @@ if (FlowStatus.CorrelatorData != null) { var wavFile = new WavFile(); - var filePath = DirectoryManager.GetAudioDir() + "\\音频_" + DateTime.Now.ToString("yyyyMMddHHmmss") + - ".wav"; + var filePath = + $"{DirectoryManager.GetAudioDir()}\\音频_{DateTime.Now.ToString("yyyyMMddHHmmss")}.wav"; var stream = wavFile.CreateEmpty(filePath); wavFile.WriteFilestream(stream, FlowStatus.CorrelatorData.LeftDeviceDataArray, @@ -770,8 +751,7 @@ SnapShotCommand = new RelayCommand(delegate { - var filePath = DirectoryManager.GetPictureDir() + "\\快照_" + DateTime.Now.ToString("yyyyMMddHHmmss") + - ".png"; + var filePath = $"{DirectoryManager.GetPictureDir()}\\快照_{DateTime.Now.ToString("yyyyMMddHHmmss")}.png"; filePath.SnapShot(); });