diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 9cde4bd..244f008 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -930,45 +930,6 @@ //加速度计 _eventAggregator.GetEvent().Subscribe(StartCalculateData); - //水听器 - // _eventAggregator.GetEvent().Subscribe(delegate - // { - // _checkResponseState++; - // //显示点名弹窗 - // if (_checkResponseState == 2) - // { - // //因为是广播发的数据，所以会收到两条回复，但是只需要显示一次对话框 - // Application.Current.Dispatcher.Invoke(delegate - // { - // _dialogService.Show("CheckResponseDialog", null, delegate(IDialogResult result) - // { - // if (result.Result == ButtonResult.Cancel) - // { - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.Abort) - // { - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.OK) - // { - // //水听器数据采集完毕，开始计算 - // StartCalculateData(); - // } - // }); - // _checkResponseState = 0; - // }); - // } - // else - // { - // "MainWindowViewModel".WriteLog($"收到显示点名框指令 => 第{_checkResponseState}次"); - // } - // }); - //数字键盘 _eventAggregator.GetEvent().Subscribe(delegate(NumberStruct number) { diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 9cde4bd..244f008 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -930,45 +930,6 @@ //加速度计 _eventAggregator.GetEvent().Subscribe(StartCalculateData); - //水听器 - // _eventAggregator.GetEvent().Subscribe(delegate - // { - // _checkResponseState++; - // //显示点名弹窗 - // if (_checkResponseState == 2) - // { - // //因为是广播发的数据，所以会收到两条回复，但是只需要显示一次对话框 - // Application.Current.Dispatcher.Invoke(delegate - // { - // _dialogService.Show("CheckResponseDialog", null, delegate(IDialogResult result) - // { - // if (result.Result == ButtonResult.Cancel) - // { - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.Abort) - // { - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.OK) - // { - // //水听器数据采集完毕，开始计算 - // StartCalculateData(); - // } - // }); - // _checkResponseState = 0; - // }); - // } - // else - // { - // "MainWindowViewModel".WriteLog($"收到显示点名框指令 => 第{_checkResponseState}次"); - // } - // }); - //数字键盘 _eventAggregator.GetEvent().Subscribe(delegate(NumberStruct number) { diff --git a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs index 451eda6..7ccb92f 100644 --- a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs +++ b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs @@ -12,7 +12,11 @@ { public class SimplyAuditionDialogViewModel : BindableBase, IDialogAware { - public event Action RequestClose; + public event Action RequestClose + { + add { } + remove { } + } #region VM diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 9cde4bd..244f008 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -930,45 +930,6 @@ //加速度计 _eventAggregator.GetEvent().Subscribe(StartCalculateData); - //水听器 - // _eventAggregator.GetEvent().Subscribe(delegate - // { - // _checkResponseState++; - // //显示点名弹窗 - // if (_checkResponseState == 2) - // { - // //因为是广播发的数据，所以会收到两条回复，但是只需要显示一次对话框 - // Application.Current.Dispatcher.Invoke(delegate - // { - // _dialogService.Show("CheckResponseDialog", null, delegate(IDialogResult result) - // { - // if (result.Result == ButtonResult.Cancel) - // { - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.Abort) - // { - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.OK) - // { - // //水听器数据采集完毕，开始计算 - // StartCalculateData(); - // } - // }); - // _checkResponseState = 0; - // }); - // } - // else - // { - // "MainWindowViewModel".WriteLog($"收到显示点名框指令 => 第{_checkResponseState}次"); - // } - // }); - //数字键盘 _eventAggregator.GetEvent().Subscribe(delegate(NumberStruct number) { diff --git a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs index 451eda6..7ccb92f 100644 --- a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs +++ b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs @@ -12,7 +12,11 @@ { public class SimplyAuditionDialogViewModel : BindableBase, IDialogAware { - public event Action RequestClose; + public event Action RequestClose + { + add { } + remove { } + } #region VM diff --git a/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs b/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs index 7529d32..a7db11a 100644 --- a/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs +++ b/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs @@ -11,7 +11,11 @@ { public class SoundSampleRateDialogViewModel : BindableBase, IDialogAware { - public event Action RequestClose; + public event Action RequestClose + { + add { } + remove { } + } #region VM diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 9cde4bd..244f008 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -930,45 +930,6 @@ //加速度计 _eventAggregator.GetEvent().Subscribe(StartCalculateData); - //水听器 - // _eventAggregator.GetEvent().Subscribe(delegate - // { - // _checkResponseState++; - // //显示点名弹窗 - // if (_checkResponseState == 2) - // { - // //因为是广播发的数据，所以会收到两条回复，但是只需要显示一次对话框 - // Application.Current.Dispatcher.Invoke(delegate - // { - // _dialogService.Show("CheckResponseDialog", null, delegate(IDialogResult result) - // { - // if (result.Result == ButtonResult.Cancel) - // { - // MessageBox.Show("数据未校验，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.Abort) - // { - // MessageBox.Show("数据校验被终止，无法进行计算", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); - // return; - // } - // - // if (result.Result == ButtonResult.OK) - // { - // //水听器数据采集完毕，开始计算 - // StartCalculateData(); - // } - // }); - // _checkResponseState = 0; - // }); - // } - // else - // { - // "MainWindowViewModel".WriteLog($"收到显示点名框指令 => 第{_checkResponseState}次"); - // } - // }); - //数字键盘 _eventAggregator.GetEvent().Subscribe(delegate(NumberStruct number) { diff --git a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs index 451eda6..7ccb92f 100644 --- a/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs +++ b/Correlator/ViewModels/SimplyAuditionDialogViewModel.cs @@ -12,7 +12,11 @@ { public class SimplyAuditionDialogViewModel : BindableBase, IDialogAware { - public event Action RequestClose; + public event Action RequestClose + { + add { } + remove { } + } #region VM diff --git a/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs b/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs index 7529d32..a7db11a 100644 --- a/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs +++ b/Correlator/ViewModels/SoundSampleRateDialogViewModel.cs @@ -11,7 +11,11 @@ { public class SoundSampleRateDialogViewModel : BindableBase, IDialogAware { - public event Action RequestClose; + public event Action RequestClose + { + add { } + remove { } + } #region VM diff --git a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs index 4062e02..6dda948 100644 --- a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs +++ b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs @@ -11,7 +11,11 @@ { public class SoundSpeedDialogViewModel : BindableBase, IDialogAware { - public event Action RequestClose; + public event Action RequestClose + { + add { } + remove { } + } #region VM