diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index cb745f0..b9b9ade 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -28,6 +28,8 @@ using System.Xml.Linq; using TouchSocket.Core; using TouchSocket.Sockets; using VncSharpWpf; +using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper; +using static SunlightCentralizedControlManagement_SCCM_.ViewModel.MainWindowViewModel; using static SunlightCentralizedControlManagement_SCCM_.WindowsView.ViewStep; using static System.Net.WebRequestMethods; using static System.Windows.Forms.VisualStyles.VisualStyleElement.Rebar; @@ -120,7 +122,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } else { - MessageBox.Show(Properties.Resources.TMNR, "800", MessageBoxButton.OK, MessageBoxImage.Information); // + // MessageBox.Show(Properties.Resources.TMNR, "800", MessageBoxButton.OK, MessageBoxImage.Information); // } } @@ -164,12 +166,50 @@ namespace SunlightCentralizedControlManagement_SCCM_.View DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); int index = Convert.ToInt16(drEmployee.Field("ID")); - MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString - { - ID = index, - DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() - }); + if (MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("Type")) + {//网络 + MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else + {//串口 + if (drEmployee.Field("Serial") == "PORT1") + { + stringQueueSerial_1.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else if (drEmployee.Field("Serial") == "PORT2") + { + stringQueueSerial_2.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else if (drEmployee.Field("Serial") == "PORT3") + { + stringQueueSerial_3.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else if (drEmployee.Field("Serial") == "PORT4") + { + stringQueueSerial_4.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + } if (!mode) { MessageBox.Show(machine + Properties.Resources.user_lock, "800", MessageBoxButton.OK, MessageBoxImage.Information); @@ -204,11 +244,49 @@ namespace SunlightCentralizedControlManagement_SCCM_.View DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); int index = Convert.ToInt16(drEmployee.Field("ID")); - MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString - { - ID = index, - DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() - }); + if (MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("Type")) + {//网络 + MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else + {//串口 + if (drEmployee.Field("Serial") == "PORT1") + { + stringQueueSerial_1.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else if (drEmployee.Field("Serial") == "PORT2") + { + stringQueueSerial_2.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else if (drEmployee.Field("Serial") == "PORT3") + { + stringQueueSerial_3.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + else if (drEmployee.Field("Serial") == "PORT4") + { + stringQueueSerial_4.Enqueue(new QueueSerial + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } + } } }//手自动