diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index 0fe9a31..fecd629 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -59,6 +59,7 @@ containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); } } } \ No newline at end of file diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index 0fe9a31..fecd629 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -59,6 +59,7 @@ containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); } } } \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index e416ec6..cb3946e 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -208,6 +208,9 @@ AddSoundSpeedDialog.xaml + + AlertControlDialog.xaml + AlertMessageDialog.xaml @@ -269,6 +272,7 @@ + @@ -296,6 +300,7 @@ PictureFileView.xaml + Designer diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index 0fe9a31..fecd629 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -59,6 +59,7 @@ containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); } } } \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index e416ec6..cb3946e 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -208,6 +208,9 @@ AddSoundSpeedDialog.xaml + + AlertControlDialog.xaml + AlertMessageDialog.xaml @@ -269,6 +272,7 @@ + @@ -296,6 +300,7 @@ PictureFileView.xaml + Designer diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index ee77bc4..4c897c0 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -107,7 +107,6 @@ if (receiveData[0] == 0xA3 && receiveData[1] == 0x20) { int index = receiveData[15]; - Debug.WriteLine($"SerialPortServiceImpl => {index}"); //取出seq,确定收到的是第几包数据 FlowStatus.SeqCaches.Add(index); @@ -134,7 +133,7 @@ HandleListenData(tags); break; default: - Debug.WriteLine("SerialPortServiceImpl => " + receiveData.Length); + Console.WriteLine($@"SerialPortServiceImpl => {receiveData.Length}"); break; } } diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs index 0fe9a31..fecd629 100644 --- a/Correlator/App.xaml.cs +++ b/Correlator/App.xaml.cs @@ -59,6 +59,7 @@ containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); } } } \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index e416ec6..cb3946e 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -208,6 +208,9 @@ AddSoundSpeedDialog.xaml + + AlertControlDialog.xaml + AlertMessageDialog.xaml @@ -269,6 +272,7 @@ + @@ -296,6 +300,7 @@ PictureFileView.xaml + Designer diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index ee77bc4..4c897c0 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -107,7 +107,6 @@ if (receiveData[0] == 0xA3 && receiveData[1] == 0x20) { int index = receiveData[15]; - Debug.WriteLine($"SerialPortServiceImpl => {index}"); //取出seq,确定收到的是第几包数据 FlowStatus.SeqCaches.Add(index); @@ -134,7 +133,7 @@ HandleListenData(tags); break; default: - Debug.WriteLine("SerialPortServiceImpl => " + receiveData.Length); + Console.WriteLine($@"SerialPortServiceImpl => {receiveData.Length}"); break; } } diff --git a/Correlator/Dialog/AlertControlDialog.xaml b/Correlator/Dialog/AlertControlDialog.xaml new file mode 100644 index 0000000..a704d3a --- /dev/null +++ b/Correlator/Dialog/AlertControlDialog.xaml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +