diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index 19d6a5d..47e5bdf 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -55,7 +55,6 @@ Grid.Row="1" Margin="10" FontSize="14" - Foreground="{StaticResource MainThemeBrush}" Text="数据计算中,请稍后......0s" /> (); var i = 1; - //筛选大于50K的音频文件 var files = new DirectoryInfo(DirectoryManager.GetAudioDir()) .GetFiles("*", SearchOption.AllDirectories) .OrderBy(file => file.CreationTime) .Reverse(); foreach (var file in files) { - if (file.Length < 1024 * 50) + var fileName = file.Name; + if (fileName.Contains("听音") && file.Length < 1024 * 50) { + //筛选小于50K的音频文件 RuntimeCache.SmallAudioFiles.Add(file.FullName); } else { - var fileName = file.Name; var fileSource = fileName.Contains("听音") ? "听音" : ""; - audioFiles.Add(new AudioFile { Order = i++, diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index 19d6a5d..47e5bdf 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -55,7 +55,6 @@ Grid.Row="1" Margin="10" FontSize="14" - Foreground="{StaticResource MainThemeBrush}" Text="数据计算中,请稍后......0s" /> (); var i = 1; - //筛选大于50K的音频文件 var files = new DirectoryInfo(DirectoryManager.GetAudioDir()) .GetFiles("*", SearchOption.AllDirectories) .OrderBy(file => file.CreationTime) .Reverse(); foreach (var file in files) { - if (file.Length < 1024 * 50) + var fileName = file.Name; + if (fileName.Contains("听音") && file.Length < 1024 * 50) { + //筛选小于50K的音频文件 RuntimeCache.SmallAudioFiles.Add(file.FullName); } else { - var fileName = file.Name; var fileSource = fileName.Contains("听音") ? "听音" : ""; - audioFiles.Add(new AudioFile { Order = i++, diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 6283265..eb71be4 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -908,11 +908,13 @@ { if (RuntimeCache.CorrelatorData != null) { - var filePath = $"{DirectoryManager.GetAudioDir()}\\音频_{DateTime.Now:yyyyMMdd_HHmmss}.wav"; - filePath.SaveWavFile( - RuntimeCache.CorrelatorData.LeftDeviceDataArray, - RuntimeCache.CorrelatorData.RightDeviceDataArray - ); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + + var redWavFilePath = $"{DirectoryManager.GetAudioDir()}\\音频_红_{time}.wav"; + redWavFilePath.SaveWavFile(RuntimeCache.CorrelatorData.LeftDeviceDataArray); + + var blueWavFilePath = $"{DirectoryManager.GetAudioDir()}\\音频_蓝_{time}.wav"; + blueWavFilePath.SaveWavFile(RuntimeCache.CorrelatorData.RightDeviceDataArray); Growl.Success("音频已保存"); } diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index 19d6a5d..47e5bdf 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -55,7 +55,6 @@ Grid.Row="1" Margin="10" FontSize="14" - Foreground="{StaticResource MainThemeBrush}" Text="数据计算中,请稍后......0s" /> (); var i = 1; - //筛选大于50K的音频文件 var files = new DirectoryInfo(DirectoryManager.GetAudioDir()) .GetFiles("*", SearchOption.AllDirectories) .OrderBy(file => file.CreationTime) .Reverse(); foreach (var file in files) { - if (file.Length < 1024 * 50) + var fileName = file.Name; + if (fileName.Contains("听音") && file.Length < 1024 * 50) { + //筛选小于50K的音频文件 RuntimeCache.SmallAudioFiles.Add(file.FullName); } else { - var fileName = file.Name; var fileSource = fileName.Contains("听音") ? "听音" : ""; - audioFiles.Add(new AudioFile { Order = i++, diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 6283265..eb71be4 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -908,11 +908,13 @@ { if (RuntimeCache.CorrelatorData != null) { - var filePath = $"{DirectoryManager.GetAudioDir()}\\音频_{DateTime.Now:yyyyMMdd_HHmmss}.wav"; - filePath.SaveWavFile( - RuntimeCache.CorrelatorData.LeftDeviceDataArray, - RuntimeCache.CorrelatorData.RightDeviceDataArray - ); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + + var redWavFilePath = $"{DirectoryManager.GetAudioDir()}\\音频_红_{time}.wav"; + redWavFilePath.SaveWavFile(RuntimeCache.CorrelatorData.LeftDeviceDataArray); + + var blueWavFilePath = $"{DirectoryManager.GetAudioDir()}\\音频_蓝_{time}.wav"; + blueWavFilePath.SaveWavFile(RuntimeCache.CorrelatorData.RightDeviceDataArray); Growl.Success("音频已保存"); } diff --git a/Correlator/Views/StartupWindow.xaml b/Correlator/Views/StartupWindow.xaml index b2c9824..0f76e04 100644 --- a/Correlator/Views/StartupWindow.xaml +++ b/Correlator/Views/StartupWindow.xaml @@ -35,8 +35,10 @@ + Maximum="150" + Style="{x:Null}" /> \ No newline at end of file