diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 616cf82..e44fb6a 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -183,6 +183,9 @@
AddSoundSpeedDialog.xaml
+
+ CheckResponseDialog.xaml
+
EditFilterDialog.xaml
@@ -278,6 +281,10 @@
PipeRangeWindow.xaml
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 616cf82..e44fb6a 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -183,6 +183,9 @@
AddSoundSpeedDialog.xaml
+
+ CheckResponseDialog.xaml
+
EditFilterDialog.xaml
@@ -278,6 +281,10 @@
PipeRangeWindow.xaml
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
new file mode 100644
index 0000000..06617eb
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 616cf82..e44fb6a 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -183,6 +183,9 @@
AddSoundSpeedDialog.xaml
+
+ CheckResponseDialog.xaml
+
EditFilterDialog.xaml
@@ -278,6 +281,10 @@
PipeRangeWindow.xaml
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
new file mode 100644
index 0000000..06617eb
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
new file mode 100644
index 0000000..f785ede
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace Correlator.Dialog
+{
+ ///
+ /// CheckResponseDialog.xaml 的交互逻辑
+ ///
+ public partial class CheckResponseDialog : Window
+ {
+ public CheckResponseDialog()
+ {
+ InitializeComponent();
+
+ GoBackButton.Click += delegate { Close(); };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ RedResponsePanel.Children.Add(ellipse);
+ }
+
+ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args)
+ {
+ for (var i = 0; i < RedResponsePanel.Children.Count; i++)
+ {
+ var child = RedResponsePanel.Children[i] as Ellipse;
+ if (child?.Fill.ToString() == "#FFD3D3D3")
+ {
+ Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") +
+ $" CheckResponseDialog.xaml => {i}");
+ }
+ }
+ };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ BlueResponsePanel.Children.Add(ellipse);
+ }
+
+ BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { };
+ }
+
+ private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e)
+ {
+ MouseDown += delegate { DragMove(); };
+ }
+ }
+}
\ No newline at end of file
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 616cf82..e44fb6a 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -183,6 +183,9 @@
AddSoundSpeedDialog.xaml
+
+ CheckResponseDialog.xaml
+
EditFilterDialog.xaml
@@ -278,6 +281,10 @@
PipeRangeWindow.xaml
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
new file mode 100644
index 0000000..06617eb
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
new file mode 100644
index 0000000..f785ede
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace Correlator.Dialog
+{
+ ///
+ /// CheckResponseDialog.xaml 的交互逻辑
+ ///
+ public partial class CheckResponseDialog : Window
+ {
+ public CheckResponseDialog()
+ {
+ InitializeComponent();
+
+ GoBackButton.Click += delegate { Close(); };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ RedResponsePanel.Children.Add(ellipse);
+ }
+
+ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args)
+ {
+ for (var i = 0; i < RedResponsePanel.Children.Count; i++)
+ {
+ var child = RedResponsePanel.Children[i] as Ellipse;
+ if (child?.Fill.ToString() == "#FFD3D3D3")
+ {
+ Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") +
+ $" CheckResponseDialog.xaml => {i}");
+ }
+ }
+ };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ BlueResponsePanel.Children.Add(ellipse);
+ }
+
+ BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { };
+ }
+
+ private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e)
+ {
+ MouseDown += delegate { DragMove(); };
+ }
+ }
+}
\ No newline at end of file
diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs
index cf863e6..65017a2 100644
--- a/Correlator/Util/MessengerToken.cs
+++ b/Correlator/Util/MessengerToken.cs
@@ -41,6 +41,9 @@
public const string RenderOscillogram = "202301130101";
public const string ClearOscillogram = "202301150101";
+ //显示点名弹窗
+ public const string ShowCheckResponseDialog = "202306060101";
+
#endregion
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 616cf82..e44fb6a 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -183,6 +183,9 @@
AddSoundSpeedDialog.xaml
+
+ CheckResponseDialog.xaml
+
EditFilterDialog.xaml
@@ -278,6 +281,10 @@
PipeRangeWindow.xaml
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
new file mode 100644
index 0000000..06617eb
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
new file mode 100644
index 0000000..f785ede
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace Correlator.Dialog
+{
+ ///
+ /// CheckResponseDialog.xaml 的交互逻辑
+ ///
+ public partial class CheckResponseDialog : Window
+ {
+ public CheckResponseDialog()
+ {
+ InitializeComponent();
+
+ GoBackButton.Click += delegate { Close(); };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ RedResponsePanel.Children.Add(ellipse);
+ }
+
+ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args)
+ {
+ for (var i = 0; i < RedResponsePanel.Children.Count; i++)
+ {
+ var child = RedResponsePanel.Children[i] as Ellipse;
+ if (child?.Fill.ToString() == "#FFD3D3D3")
+ {
+ Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") +
+ $" CheckResponseDialog.xaml => {i}");
+ }
+ }
+ };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ BlueResponsePanel.Children.Add(ellipse);
+ }
+
+ BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { };
+ }
+
+ private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e)
+ {
+ MouseDown += delegate { DragMove(); };
+ }
+ }
+}
\ No newline at end of file
diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs
index cf863e6..65017a2 100644
--- a/Correlator/Util/MessengerToken.cs
+++ b/Correlator/Util/MessengerToken.cs
@@ -41,6 +41,9 @@
public const string RenderOscillogram = "202301130101";
public const string ClearOscillogram = "202301150101";
+ //显示点名弹窗
+ public const string ShowCheckResponseDialog = "202306060101";
+
#endregion
}
}
\ No newline at end of file
diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs
index 1b22b8a..84e6158 100644
--- a/Correlator/Util/SerialPortManager.cs
+++ b/Correlator/Util/SerialPortManager.cs
@@ -87,10 +87,11 @@
}
if (operateType != "WakeupResponse") return;
+ Sp.Write("+++");
if (FlowStatus.IsHydrophone && FlowStatus.CanCollectData)
{
- //TODO 显示点名弹窗
- Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " SerialPortManager => 显示点名弹窗");
+ //显示点名弹窗
+ Messenger.Default.Send("", MessengerToken.ShowCheckResponseDialog);
}
}
else if (strResult != "")
diff --git a/Correlator/Converter/DistanceConverter.cs b/Correlator/Converter/DistanceConverter.cs
index 6de0565..feb2ebe 100644
--- a/Correlator/Converter/DistanceConverter.cs
+++ b/Correlator/Converter/DistanceConverter.cs
@@ -30,7 +30,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Converter/FilterConverter.cs b/Correlator/Converter/FilterConverter.cs
index 2aed62f..966532f 100644
--- a/Correlator/Converter/FilterConverter.cs
+++ b/Correlator/Converter/FilterConverter.cs
@@ -43,7 +43,7 @@
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index 616cf82..e44fb6a 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -183,6 +183,9 @@
AddSoundSpeedDialog.xaml
+
+ CheckResponseDialog.xaml
+
EditFilterDialog.xaml
@@ -278,6 +281,10 @@
PipeRangeWindow.xaml
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml
new file mode 100644
index 0000000..06617eb
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs
new file mode 100644
index 0000000..f785ede
--- /dev/null
+++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace Correlator.Dialog
+{
+ ///
+ /// CheckResponseDialog.xaml 的交互逻辑
+ ///
+ public partial class CheckResponseDialog : Window
+ {
+ public CheckResponseDialog()
+ {
+ InitializeComponent();
+
+ GoBackButton.Click += delegate { Close(); };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ RedResponsePanel.Children.Add(ellipse);
+ }
+
+ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args)
+ {
+ for (var i = 0; i < RedResponsePanel.Children.Count; i++)
+ {
+ var child = RedResponsePanel.Children[i] as Ellipse;
+ if (child?.Fill.ToString() == "#FFD3D3D3")
+ {
+ Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") +
+ $" CheckResponseDialog.xaml => {i}");
+ }
+ }
+ };
+
+ for (var i = 0; i < 60; i++)
+ {
+ var ellipse = new Ellipse
+ {
+ Width = 25,
+ Height = 25,
+ Margin = new Thickness(8),
+ Fill = new SolidColorBrush(Colors.LightGray)
+ };
+ BlueResponsePanel.Children.Add(ellipse);
+ }
+
+ BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { };
+ }
+
+ private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e)
+ {
+ MouseDown += delegate { DragMove(); };
+ }
+ }
+}
\ No newline at end of file
diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs
index cf863e6..65017a2 100644
--- a/Correlator/Util/MessengerToken.cs
+++ b/Correlator/Util/MessengerToken.cs
@@ -41,6 +41,9 @@
public const string RenderOscillogram = "202301130101";
public const string ClearOscillogram = "202301150101";
+ //显示点名弹窗
+ public const string ShowCheckResponseDialog = "202306060101";
+
#endregion
}
}
\ No newline at end of file
diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs
index 1b22b8a..84e6158 100644
--- a/Correlator/Util/SerialPortManager.cs
+++ b/Correlator/Util/SerialPortManager.cs
@@ -87,10 +87,11 @@
}
if (operateType != "WakeupResponse") return;
+ Sp.Write("+++");
if (FlowStatus.IsHydrophone && FlowStatus.CanCollectData)
{
- //TODO 显示点名弹窗
- Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " SerialPortManager => 显示点名弹窗");
+ //显示点名弹窗
+ Messenger.Default.Send("", MessengerToken.ShowCheckResponseDialog);
}
}
else if (strResult != "")
diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs
index 7444196..b0dbd50 100644
--- a/Correlator/ViewModel/HomePageViewModel.cs
+++ b/Correlator/ViewModel/HomePageViewModel.cs
@@ -653,6 +653,11 @@
FlowStatus.SensorBIsEnable = sensorStatus;
});
+ Messenger.Default.Register(this, MessengerToken.ShowCheckResponseDialog, s =>
+ {
+ new CheckResponseDialog { Owner = _homePageWindow }.ShowDialog();
+ });
+
// TODO 设备状态就绪，暂时不做逻辑处理，后期可以适当调整或者添加
Messenger.Default.Register(this, MessengerToken.HomePageSignal, s => { });