diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index 1e06e05..db149ba 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -23,11 +23,28 @@ + - + + + @@ -56,8 +73,8 @@ diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index 1e06e05..db149ba 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -23,11 +23,28 @@ + - + + + @@ -56,8 +73,8 @@ diff --git a/Correlator/View/AuditionWindow.xaml.cs b/Correlator/View/AuditionWindow.xaml.cs index 18617b3..f63b937 100644 --- a/Correlator/View/AuditionWindow.xaml.cs +++ b/Correlator/View/AuditionWindow.xaml.cs @@ -14,6 +14,8 @@ { InitializeComponent(); + GoBackButton.Click += delegate { Close(); }; + SensorACheckBox.Click += delegate { if (!SerialPortManager.Get.Sp.IsOpen) diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index 1e06e05..db149ba 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -23,11 +23,28 @@ + - + + + @@ -56,8 +73,8 @@ diff --git a/Correlator/View/AuditionWindow.xaml.cs b/Correlator/View/AuditionWindow.xaml.cs index 18617b3..f63b937 100644 --- a/Correlator/View/AuditionWindow.xaml.cs +++ b/Correlator/View/AuditionWindow.xaml.cs @@ -14,6 +14,8 @@ { InitializeComponent(); + GoBackButton.Click += delegate { Close(); }; + SensorACheckBox.Click += delegate { if (!SerialPortManager.Get.Sp.IsOpen) diff --git a/Correlator/View/PipeRangeWindow.xaml b/Correlator/View/PipeRangeWindow.xaml deleted file mode 100644 index 79338ce..0000000 --- a/Correlator/View/PipeRangeWindow.xaml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index 1e06e05..db149ba 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -23,11 +23,28 @@ + - + + + @@ -56,8 +73,8 @@ diff --git a/Correlator/View/AuditionWindow.xaml.cs b/Correlator/View/AuditionWindow.xaml.cs index 18617b3..f63b937 100644 --- a/Correlator/View/AuditionWindow.xaml.cs +++ b/Correlator/View/AuditionWindow.xaml.cs @@ -14,6 +14,8 @@ { InitializeComponent(); + GoBackButton.Click += delegate { Close(); }; + SensorACheckBox.Click += delegate { if (!SerialPortManager.Get.Sp.IsOpen) diff --git a/Correlator/View/PipeRangeWindow.xaml b/Correlator/View/PipeRangeWindow.xaml deleted file mode 100644 index 79338ce..0000000 --- a/Correlator/View/PipeRangeWindow.xaml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/View/PipeRangeWindow.xaml.cs b/Correlator/View/PipeRangeWindow.xaml.cs deleted file mode 100644 index 6863121..0000000 --- a/Correlator/View/PipeRangeWindow.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows; - -namespace Correlator.View -{ - public partial class PipeRangeWindow : Window - { - public PipeRangeWindow() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index 1e06e05..db149ba 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -23,11 +23,28 @@ + - + + + @@ -56,8 +73,8 @@ diff --git a/Correlator/View/AuditionWindow.xaml.cs b/Correlator/View/AuditionWindow.xaml.cs index 18617b3..f63b937 100644 --- a/Correlator/View/AuditionWindow.xaml.cs +++ b/Correlator/View/AuditionWindow.xaml.cs @@ -14,6 +14,8 @@ { InitializeComponent(); + GoBackButton.Click += delegate { Close(); }; + SensorACheckBox.Click += delegate { if (!SerialPortManager.Get.Sp.IsOpen) diff --git a/Correlator/View/PipeRangeWindow.xaml b/Correlator/View/PipeRangeWindow.xaml deleted file mode 100644 index 79338ce..0000000 --- a/Correlator/View/PipeRangeWindow.xaml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/View/PipeRangeWindow.xaml.cs b/Correlator/View/PipeRangeWindow.xaml.cs deleted file mode 100644 index 6863121..0000000 --- a/Correlator/View/PipeRangeWindow.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows; - -namespace Correlator.View -{ - public partial class PipeRangeWindow : Window - { - public PipeRangeWindow() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModel/HomePageProViewModel.cs b/Correlator/ViewModel/HomePageProViewModel.cs index 616d271..7c3656a 100644 --- a/Correlator/ViewModel/HomePageProViewModel.cs +++ b/Correlator/ViewModel/HomePageProViewModel.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; +using Correlator.Dialog; using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Service; @@ -556,6 +557,10 @@ } } }); + + //水听器 + Messenger.Default.Register(this, MessengerToken.ShowCheckResponseDialog, + timeBytes => { new CheckResponseDialog(timeBytes) { Owner = _homePageWindow }.ShowDialog(); }); } /// diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2b75b84..c4d9340 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -282,9 +282,6 @@ PictureFileWindow.xaml - - PipeRangeWindow.xaml - Designer @@ -335,7 +332,6 @@ Code - diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index 06617eb..676a083 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -8,6 +8,7 @@ Height="560" AllowsTransparency="True" Background="Transparent" + DataContext="{Binding CheckResponse, Source={StaticResource Locator}}" Loaded="CheckResponseDialog_OnLoaded" ResizeMode="NoResize" ShowInTaskbar="False" diff --git a/Correlator/Dialog/CheckResponseDialog.xaml.cs b/Correlator/Dialog/CheckResponseDialog.xaml.cs index 887adab..8f06cb0 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml.cs +++ b/Correlator/Dialog/CheckResponseDialog.xaml.cs @@ -2,6 +2,8 @@ using System.Windows; using System.Windows.Media; using System.Windows.Shapes; +using Correlator.SensorHubTag; +using Correlator.Util; namespace Correlator.Dialog { @@ -10,7 +12,7 @@ /// public partial class CheckResponseDialog : Window { - public CheckResponseDialog() + public CheckResponseDialog(byte[] timeBytes) { InitializeComponent(); @@ -30,6 +32,7 @@ RedCheckButton.Click += delegate(object sender, RoutedEventArgs args) { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev1, timeBytes); for (var i = 0; i < RedResponsePanel.Children.Count; i++) { var child = RedResponsePanel.Children[i] as Ellipse; @@ -52,7 +55,18 @@ BlueResponsePanel.Children.Add(ellipse); } - BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) { }; + BlueCheckButton.Click += delegate(object sender, RoutedEventArgs args) + { + CommandSender.StartCheckResponse(SerialPortManager.Get.Sp, DevCode.Dev2, timeBytes); + for (var i = 0; i < BlueResponsePanel.Children.Count; i++) + { + var child = BlueResponsePanel.Children[i] as Ellipse; + if (child?.Fill.ToString() == "#FFD3D3D3") + { + Debug.WriteLine($"CheckResponseDialog.xaml => {i}"); + } + } + }; } private void CheckResponseDialog_OnLoaded(object sender, RoutedEventArgs e) diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index 023fad2..d5c08e9 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -6,7 +6,7 @@ public const string RedSensorStatus = "202211150102"; public const string BlueSensorStatus = "202211150103"; - public const string HomePageSignal = "202211150104"; + public const string HomePageDeviceData = "202212190101"; public const string EditMaterialName = "202212110101"; public const string UpdateMaterialName = "202212110102"; diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index 1e06e05..db149ba 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -23,11 +23,28 @@ + - + + + @@ -56,8 +73,8 @@ diff --git a/Correlator/View/AuditionWindow.xaml.cs b/Correlator/View/AuditionWindow.xaml.cs index 18617b3..f63b937 100644 --- a/Correlator/View/AuditionWindow.xaml.cs +++ b/Correlator/View/AuditionWindow.xaml.cs @@ -14,6 +14,8 @@ { InitializeComponent(); + GoBackButton.Click += delegate { Close(); }; + SensorACheckBox.Click += delegate { if (!SerialPortManager.Get.Sp.IsOpen) diff --git a/Correlator/View/PipeRangeWindow.xaml b/Correlator/View/PipeRangeWindow.xaml deleted file mode 100644 index 79338ce..0000000 --- a/Correlator/View/PipeRangeWindow.xaml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Correlator/View/PipeRangeWindow.xaml.cs b/Correlator/View/PipeRangeWindow.xaml.cs deleted file mode 100644 index 6863121..0000000 --- a/Correlator/View/PipeRangeWindow.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows; - -namespace Correlator.View -{ - public partial class PipeRangeWindow : Window - { - public PipeRangeWindow() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModel/HomePageProViewModel.cs b/Correlator/ViewModel/HomePageProViewModel.cs index 616d271..7c3656a 100644 --- a/Correlator/ViewModel/HomePageProViewModel.cs +++ b/Correlator/ViewModel/HomePageProViewModel.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; +using Correlator.Dialog; using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Service; @@ -556,6 +557,10 @@ } } }); + + //水听器 + Messenger.Default.Register(this, MessengerToken.ShowCheckResponseDialog, + timeBytes => { new CheckResponseDialog(timeBytes) { Owner = _homePageWindow }.ShowDialog(); }); } /// diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs index 300092f..c0bb40d 100644 --- a/Correlator/ViewModel/HomePageViewModel.cs +++ b/Correlator/ViewModel/HomePageViewModel.cs @@ -561,9 +561,6 @@ Messenger.Default.Register(this, MessengerToken.ShowCheckResponseDialog, timeBytes => { new CheckResponseDialog(timeBytes) { Owner = _homePageWindow }.ShowDialog(); }); - // TODO 设备状态就绪,暂时不做逻辑处理,后期可以适当调整或者添加 - Messenger.Default.Register(this, MessengerToken.HomePageSignal, s => { }); - Messenger.Default.Register(this, MessengerToken.StartCalculate, it => { if (!it.IsReady) return;