diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml index 0a1008f..ceb93fd 100644 --- a/View/MonitorView.xaml +++ b/View/MonitorView.xaml @@ -5,7 +5,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View" xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" - xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:rdp="clr-namespace:VncSharpWpf;assembly=VncSharpWpf" xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel" xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}" @@ -148,7 +149,10 @@ - + + + + diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 15d65a5..7b14e65 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -1,4 +1,4 @@ -using SkiaSharp; + using SkiaSharp; using SunlightCentralizedControlManagement_SCCM_.ViewModel; using SunlightCentralizedControlManagement_SCCM_.WindowsView; using System; @@ -93,6 +93,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View { machines_info = 0; log.Visibility = Visibility.Visible; + rdp.Visibility = Visibility.Collapsed; Picture.Visibility = Visibility.Collapsed; }//信息 @@ -118,18 +119,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } private async void ListViewItem_Screen(object sender, MouseButtonEventArgs e) { + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); + string host = drEmployee.Field("IP"); + int port = 5900; + string password = "123456";//drEmployee.Field("SYSKEY"); + // bool Desktop = drEmployee.Field("Desktop"); + if (!drEmployee.Field("Desktop")) + { + MessageBox.Show(Properties.Resources.Not_a, "Desktop", MessageBoxButton.OK); + return; + } + machines_info = 1; - log.Visibility = Visibility.Visible; + log.Visibility = Visibility.Collapsed; Picture.Visibility = Visibility.Collapsed; + rdp.Visibility = Visibility.Visible; RemoteDesktopWpf remoteDesktopWpf = new RemoteDesktopWpf(); - Picture.Content = remoteDesktopWpf; - - - DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); - string host = drEmployee.Field("IP"); - int port = Convert.ToInt16(drEmployee.Field("PORT")); - string password = "123456";//drEmployee.Field("SYSKEY"); + Picture.Content = remoteDesktopWpf; if (await PingTest(host)) { @@ -150,8 +157,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View }//远程 private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e) { + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); + if (!drEmployee.Field("Dispense")) + { + MessageBox.Show(Properties.Resources.Not_a, "Dispense", MessageBoxButton.OK); + return; + } + machines_info = 2; log.Visibility = Visibility.Visible; + rdp.Visibility = Visibility.Collapsed; Picture.Visibility = Visibility.Collapsed; DyelotView dyelotView = new DyelotView(); dyelotView.Dyelot(workOrder); @@ -160,6 +175,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void ListViewItem_Curve(object sender, MouseButtonEventArgs e) { log.Visibility = Visibility.Collapsed; + rdp.Visibility = Visibility.Collapsed; Picture.Visibility = Visibility.Visible; Picture.Content = new View.CurveDiagram(true, "", "", "", workOrder); machines_info = 3;