diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/IAudioService.cs b/Correlator/DataService/IAudioService.cs index c010987..7ccb4e8 100644 --- a/Correlator/DataService/IAudioService.cs +++ b/Correlator/DataService/IAudioService.cs @@ -2,7 +2,7 @@ { public interface IAudioService { - void Start(); + void Start(string deviceCode); void Write(byte[] pcm); diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/IAudioService.cs b/Correlator/DataService/IAudioService.cs index c010987..7ccb4e8 100644 --- a/Correlator/DataService/IAudioService.cs +++ b/Correlator/DataService/IAudioService.cs @@ -2,7 +2,7 @@ { public interface IAudioService { - void Start(); + void Start(string deviceCode); void Write(byte[] pcm); diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs index 6481428..384caec 100644 --- a/Correlator/Util/FlowStatus.cs +++ b/Correlator/Util/FlowStatus.cs @@ -77,5 +77,10 @@ /// 正在听音的设备编号 /// public static string CurrentListenSoundDevCode = DevCode.Dev1; + + /// + /// 小于1K的音频文件全路径集合 + /// + public static readonly List SmallAudioFiles = new List(); } } \ No newline at end of file diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/IAudioService.cs b/Correlator/DataService/IAudioService.cs index c010987..7ccb4e8 100644 --- a/Correlator/DataService/IAudioService.cs +++ b/Correlator/DataService/IAudioService.cs @@ -2,7 +2,7 @@ { public interface IAudioService { - void Start(); + void Start(string deviceCode); void Write(byte[] pcm); diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs index 6481428..384caec 100644 --- a/Correlator/Util/FlowStatus.cs +++ b/Correlator/Util/FlowStatus.cs @@ -77,5 +77,10 @@ /// 正在听音的设备编号 /// public static string CurrentListenSoundDevCode = DevCode.Dev1; + + /// + /// 小于1K的音频文件全路径集合 + /// + public static readonly List SmallAudioFiles = new List(); } } \ No newline at end of file diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 53a537f..c227b07 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -163,17 +163,31 @@ private static List GetTotalAudioFiles() { + var audioFiles = new List(); var i = 1; - return new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories).Select( - file => new AudioFile + //筛选大于1K的音频文件 + var files = new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories); + foreach (var file in files) + { + if (file.Length < 1024) { - Order = i++, - FileName = file.Name, - FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, - FileSize = file.Length.FormatFileSize(), - CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - IsPlaying = false - }).ToList(); + FlowStatus.SmallAudioFiles.Add(file.FullName); + } + else + { + audioFiles.Add(new AudioFile + { + Order = i++, + FileName = file.Name, + FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + IsPlaying = false + }); + } + } + + return audioFiles; } } } \ No newline at end of file diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/IAudioService.cs b/Correlator/DataService/IAudioService.cs index c010987..7ccb4e8 100644 --- a/Correlator/DataService/IAudioService.cs +++ b/Correlator/DataService/IAudioService.cs @@ -2,7 +2,7 @@ { public interface IAudioService { - void Start(); + void Start(string deviceCode); void Write(byte[] pcm); diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs index 6481428..384caec 100644 --- a/Correlator/Util/FlowStatus.cs +++ b/Correlator/Util/FlowStatus.cs @@ -77,5 +77,10 @@ /// 正在听音的设备编号 /// public static string CurrentListenSoundDevCode = DevCode.Dev1; + + /// + /// 小于1K的音频文件全路径集合 + /// + public static readonly List SmallAudioFiles = new List(); } } \ No newline at end of file diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 53a537f..c227b07 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -163,17 +163,31 @@ private static List GetTotalAudioFiles() { + var audioFiles = new List(); var i = 1; - return new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories).Select( - file => new AudioFile + //筛选大于1K的音频文件 + var files = new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories); + foreach (var file in files) + { + if (file.Length < 1024) { - Order = i++, - FileName = file.Name, - FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, - FileSize = file.Length.FormatFileSize(), - CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - IsPlaying = false - }).ToList(); + FlowStatus.SmallAudioFiles.Add(file.FullName); + } + else + { + audioFiles.Add(new AudioFile + { + Order = i++, + FileName = file.Name, + FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + IsPlaying = false + }); + } + } + + return audioFiles; } } } \ No newline at end of file diff --git a/Correlator/ViewModels/AuditionViewModel.cs b/Correlator/ViewModels/AuditionViewModel.cs index 74376fa..b334ec9 100644 --- a/Correlator/ViewModels/AuditionViewModel.cs +++ b/Correlator/ViewModels/AuditionViewModel.cs @@ -10,7 +10,6 @@ using Prism.Events; using Prism.Mvvm; using Prism.Services.Dialogs; -using WaveFormat = NAudio.Wave.WaveFormat; namespace Correlator.ViewModels { @@ -144,9 +143,11 @@ } else { - CommandSender.SendSoundCollectCmd(_serialPortService.Sp, _isRedSensor ? DevCode.Dev1 : DevCode.Dev2); - FlowStatus.CurrentListenSoundDevCode = _isRedSensor ? DevCode.Dev1 : DevCode.Dev2; - _audioService.Start(); + var devCode = _isRedSensor ? DevCode.Dev1 : DevCode.Dev2; + + CommandSender.SendSoundCollectCmd(_serialPortService.Sp, devCode); + FlowStatus.CurrentListenSoundDevCode = devCode; + _audioService.Start(devCode); _isStartRecording = true; //波形图开始模拟 diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/IAudioService.cs b/Correlator/DataService/IAudioService.cs index c010987..7ccb4e8 100644 --- a/Correlator/DataService/IAudioService.cs +++ b/Correlator/DataService/IAudioService.cs @@ -2,7 +2,7 @@ { public interface IAudioService { - void Start(); + void Start(string deviceCode); void Write(byte[] pcm); diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs index 6481428..384caec 100644 --- a/Correlator/Util/FlowStatus.cs +++ b/Correlator/Util/FlowStatus.cs @@ -77,5 +77,10 @@ /// 正在听音的设备编号 /// public static string CurrentListenSoundDevCode = DevCode.Dev1; + + /// + /// 小于1K的音频文件全路径集合 + /// + public static readonly List SmallAudioFiles = new List(); } } \ No newline at end of file diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 53a537f..c227b07 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -163,17 +163,31 @@ private static List GetTotalAudioFiles() { + var audioFiles = new List(); var i = 1; - return new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories).Select( - file => new AudioFile + //筛选大于1K的音频文件 + var files = new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories); + foreach (var file in files) + { + if (file.Length < 1024) { - Order = i++, - FileName = file.Name, - FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, - FileSize = file.Length.FormatFileSize(), - CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - IsPlaying = false - }).ToList(); + FlowStatus.SmallAudioFiles.Add(file.FullName); + } + else + { + audioFiles.Add(new AudioFile + { + Order = i++, + FileName = file.Name, + FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + IsPlaying = false + }); + } + } + + return audioFiles; } } } \ No newline at end of file diff --git a/Correlator/ViewModels/AuditionViewModel.cs b/Correlator/ViewModels/AuditionViewModel.cs index 74376fa..b334ec9 100644 --- a/Correlator/ViewModels/AuditionViewModel.cs +++ b/Correlator/ViewModels/AuditionViewModel.cs @@ -10,7 +10,6 @@ using Prism.Events; using Prism.Mvvm; using Prism.Services.Dialogs; -using WaveFormat = NAudio.Wave.WaveFormat; namespace Correlator.ViewModels { @@ -144,9 +143,11 @@ } else { - CommandSender.SendSoundCollectCmd(_serialPortService.Sp, _isRedSensor ? DevCode.Dev1 : DevCode.Dev2); - FlowStatus.CurrentListenSoundDevCode = _isRedSensor ? DevCode.Dev1 : DevCode.Dev2; - _audioService.Start(); + var devCode = _isRedSensor ? DevCode.Dev1 : DevCode.Dev2; + + CommandSender.SendSoundCollectCmd(_serialPortService.Sp, devCode); + FlowStatus.CurrentListenSoundDevCode = devCode; + _audioService.Start(devCode); _isStartRecording = true; //波形图开始模拟 diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 0008701..3de31b7 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -816,12 +816,12 @@ } //删除小于1K的音频 - // foreach (var file in FlowStatus.SmallAudioFiles) - // { - // File.Delete(file); - // } - // - // FlowStatus.SmallAudioFiles.Clear(); + foreach (var file in FlowStatus.SmallAudioFiles) + { + File.Delete(file); + } + + FlowStatus.SmallAudioFiles.Clear(); _mainWindow.Close(); } ); diff --git a/Correlator/DataService/AudioServiceImpl.cs b/Correlator/DataService/AudioServiceImpl.cs index 73c2f7e..74bfd97 100644 --- a/Correlator/DataService/AudioServiceImpl.cs +++ b/Correlator/DataService/AudioServiceImpl.cs @@ -1,4 +1,5 @@ using System; +using Correlator.SensorHubTag; using Correlator.Util; using NAudio.Wave; @@ -14,12 +15,25 @@ () => new BufferedWaveProvider(new WaveFormat(7500, 24, 1)) ); - public void Start() + public void Start(string deviceCode) { _waveOut.Init(_lazyWaveProvider.Value); _waveOut.Play(); - var fileName = $"{DirectoryManager.GetAudioDir()}/听音_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.wav"; + string fileName; + var audioDir = DirectoryManager.GetAudioDir(); + var time = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + if (deviceCode == DevCode.Dev1) + { + //红色传感器听音 + fileName = $"{audioDir}/听音_红_{time}.wav"; + } + else + { + //蓝色传感器听音 + fileName = $"{audioDir}/听音_蓝_{time}.wav"; + } + _waveFileWriter = new WaveFileWriter(fileName, new WaveFormat(7500, 24, 1)); } diff --git a/Correlator/DataService/IAudioService.cs b/Correlator/DataService/IAudioService.cs index c010987..7ccb4e8 100644 --- a/Correlator/DataService/IAudioService.cs +++ b/Correlator/DataService/IAudioService.cs @@ -2,7 +2,7 @@ { public interface IAudioService { - void Start(); + void Start(string deviceCode); void Write(byte[] pcm); diff --git a/Correlator/Util/FlowStatus.cs b/Correlator/Util/FlowStatus.cs index 6481428..384caec 100644 --- a/Correlator/Util/FlowStatus.cs +++ b/Correlator/Util/FlowStatus.cs @@ -77,5 +77,10 @@ /// 正在听音的设备编号 /// public static string CurrentListenSoundDevCode = DevCode.Dev1; + + /// + /// 小于1K的音频文件全路径集合 + /// + public static readonly List SmallAudioFiles = new List(); } } \ No newline at end of file diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs index 53a537f..c227b07 100644 --- a/Correlator/ViewModels/AudioFileViewModel.cs +++ b/Correlator/ViewModels/AudioFileViewModel.cs @@ -163,17 +163,31 @@ private static List GetTotalAudioFiles() { + var audioFiles = new List(); var i = 1; - return new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories).Select( - file => new AudioFile + //筛选大于1K的音频文件 + var files = new DirectoryInfo(DirectoryManager.GetAudioDir()).GetFiles("*", SearchOption.AllDirectories); + foreach (var file in files) + { + if (file.Length < 1024) { - Order = i++, - FileName = file.Name, - FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, - FileSize = file.Length.FormatFileSize(), - CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), - IsPlaying = false - }).ToList(); + FlowStatus.SmallAudioFiles.Add(file.FullName); + } + else + { + audioFiles.Add(new AudioFile + { + Order = i++, + FileName = file.Name, + FullPath = DirectoryManager.GetAudioDir() + "\\" + file.Name, + FileSize = file.Length.FormatFileSize(), + CreationTime = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss"), + IsPlaying = false + }); + } + } + + return audioFiles; } } } \ No newline at end of file diff --git a/Correlator/ViewModels/AuditionViewModel.cs b/Correlator/ViewModels/AuditionViewModel.cs index 74376fa..b334ec9 100644 --- a/Correlator/ViewModels/AuditionViewModel.cs +++ b/Correlator/ViewModels/AuditionViewModel.cs @@ -10,7 +10,6 @@ using Prism.Events; using Prism.Mvvm; using Prism.Services.Dialogs; -using WaveFormat = NAudio.Wave.WaveFormat; namespace Correlator.ViewModels { @@ -144,9 +143,11 @@ } else { - CommandSender.SendSoundCollectCmd(_serialPortService.Sp, _isRedSensor ? DevCode.Dev1 : DevCode.Dev2); - FlowStatus.CurrentListenSoundDevCode = _isRedSensor ? DevCode.Dev1 : DevCode.Dev2; - _audioService.Start(); + var devCode = _isRedSensor ? DevCode.Dev1 : DevCode.Dev2; + + CommandSender.SendSoundCollectCmd(_serialPortService.Sp, devCode); + FlowStatus.CurrentListenSoundDevCode = devCode; + _audioService.Start(devCode); _isStartRecording = true; //波形图开始模拟 diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 0008701..3de31b7 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -816,12 +816,12 @@ } //删除小于1K的音频 - // foreach (var file in FlowStatus.SmallAudioFiles) - // { - // File.Delete(file); - // } - // - // FlowStatus.SmallAudioFiles.Clear(); + foreach (var file in FlowStatus.SmallAudioFiles) + { + File.Delete(file); + } + + FlowStatus.SmallAudioFiles.Clear(); _mainWindow.Close(); } ); diff --git a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs index 0898560..b67086d 100644 --- a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs +++ b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs @@ -127,7 +127,7 @@ else { CommandSender.SendSoundCollectCmd(_serialPortService.Sp, DevCode.Dev1); - audioService.Start(); + audioService.Start(DevCode.Dev1); IsRedRecording = true; } }); @@ -179,7 +179,7 @@ else { CommandSender.SendSoundCollectCmd(_serialPortService.Sp, DevCode.Dev2); - audioService.Start(); + audioService.Start(DevCode.Dev2); IsBlueRecording = true; } });