添加资源

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -150,6 +150,9 @@
     <Compile Include="UserControls\DispenseMacInfo.xaml.cs">
       <DependentUpon>DispenseMacInfo.xaml</DependentUpon>
     </Compile>
+    <Compile Include="WindowsView\UserInf.xaml.cs">
+      <DependentUpon>UserInf.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WindowsView\UserInformation.xaml.cs">
       <DependentUpon>UserInformation.xaml</DependentUpon>
     </Compile>
@@ -289,6 +292,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="WindowsView\UserInf.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="WindowsView\UserInformation.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -525,6 +532,11 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="lmage\IconParkExtend.png" />
+    <Resource Include="lmage\IconParkExtendR.png" />
+    <Resource Include="lmage\IconParkExtendY.png" />
+    <Resource Include="lmage\IconParkInfo.png" />
+    <Resource Include="lmage\IconParkUsbOne.png" />
     <Resource Include="lmage\00.png" />
     <Resource Include="lmage\1000-1.png" />
     <Resource Include="lmage\1000-2.png" />

View/MonitorView.xaml.cs

@@ -142,68 +142,74 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void MenuItem_LOCK_XML(object sender, RoutedEventArgs e)
         {
-            bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field<bool>("LOCK");
+            if (!string.IsNullOrEmpty(machine))
+            {
+                bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field<bool>("LOCK");
 
-            Dictionary<string, object> dat_ = new Dictionary<string, object>();
-            dat_.Clear();
+                Dictionary<string, object> dat_ = new Dictionary<string, object>();
+                dat_.Clear();
 
-            if (!mode)
-            {
-                dat_.Add("NAME", "LOCK");
-                dat_.Add("VALUE", "True");
-                MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "True");
-            }
-            else
-            {
-                dat_.Add("NAME", "LOCK");
-                dat_.Add("VALUE", "False");
-                MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "False");
-            }
+                if (!mode)
+                {
+                    dat_.Add("NAME", "LOCK");
+                    dat_.Add("VALUE", "True");
+                    MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "True");
+                }
+                else
+                {
+                    dat_.Add("NAME", "LOCK");
+                    dat_.Add("VALUE", "False");
+                    MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "False");
+                }
 
-            DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
-            int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
-            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
-            {
-                ID = index,
-                DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString()
-            });
+                DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                {
+                    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);
-            }
-            else
-            {
-                MessageBox.Show(machine + Properties.Resources.user_unlock, "800", MessageBoxButton.OK, MessageBoxImage.Information);
+                if (!mode)
+                {
+                    MessageBox.Show(machine + Properties.Resources.user_lock, "800", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+                else
+                {
+                    MessageBox.Show(machine + Properties.Resources.user_unlock, "800", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
             }
         }//锁定
         private void MenuItem_AUTO_XML(object sender, RoutedEventArgs e)
         {
-            bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field<bool>("AUTO");
+            if (!string.IsNullOrEmpty(machine))
+            {
+                bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field<bool>("AUTO");
 
-            Dictionary<string, object> dat_ = new Dictionary<string, object>();
-            dat_.Clear();
+                Dictionary<string, object> dat_ = new Dictionary<string, object>();
+                dat_.Clear();
 
-            if (!mode)
-            {
-                dat_.Add("NAME", "AUTO");
-                dat_.Add("VALUE", "True");
-                MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "True");
-            }
-            else
-            {
-                dat_.Add("NAME", "AUTO");
-                dat_.Add("VALUE", "FALSE");
-                MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "False");
-            }
+                if (!mode)
+                {
+                    dat_.Add("NAME", "AUTO");
+                    dat_.Add("VALUE", "True");
+                    MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "True");
+                }
+                else
+                {
+                    dat_.Add("NAME", "AUTO");
+                    dat_.Add("VALUE", "FALSE");
+                    MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "False");
+                }
 
-            DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
-            int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
-            MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
-            {
-                ID = index,
-                DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString()
-            });
+                DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+                int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
+                {
+                    ID = index,
+                    DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString()
+                });
+            }
 
         }//手自动
         private void MenuItem_Stop_XML(object sender, RoutedEventArgs e)
@@ -224,8 +230,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         }//停止
         private void MenuItem_Start_XML(object sender, RoutedEventArgs e)
         {
-           
+            if (!string.IsNullOrEmpty(machine))
+            {
 
+            }
         }//开始
         private void ListViewItem_DyeingMachine(object sender, MouseButtonEventArgs e)
         {

WindowsView/UserInf.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="SunlightCentralizedControlManagement_SCCM_.WindowsView.UserInf"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.WindowsView"
+        xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
+        WindowStartupLocation="CenterScreen"
+        Loaded ="Window_Loaded"
+        ResizeMode="NoResize"
+        mc:Ignorable="d"
+        Title="SUNLIGHT 800" Height="400" Width="800">
+    <Grid>
+        <Grid Margin="0,0,0,100">
+            <TextBox x:Name="INF_DATA" Margin="150,5,5,0" TextWrapping="Wrap" FontSize="30" IsReadOnly="True" BorderBrush="#FF673AB7" BorderThickness="2,2,2,2" />
+        <Image Height="100" Width="100" FlowDirection="LeftToRight" HorizontalAlignment="Left" Margin="25,0,0,0" Source="/Lmage/IconParkInfo.png" VerticalAlignment="Center"/>
+        </Grid>
+        <Button Content="{x:Static lang:Resources.YES}" HorizontalAlignment="Left" Height="45" Margin="50,70,20,20" 
+                VerticalAlignment="Bottom" Width="100" Click="YES_Click" HorizontalContentAlignment="Center"/>
+        <Button Content="{x:Static lang:Resources.NO}" HorizontalAlignment="Right" Height="45" Margin="50,70,20,20" 
+                VerticalAlignment="Bottom" Width="100" Click="YES_Click"/>
+    </Grid>
+</Window>

WindowsView/UserInf.xaml.cs

@@ -0,0 +1,47 @@
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using System.Xml.Linq;
+using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+
+namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
+{
+    /// <summary>
+    /// ViewProgram.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserInf : Window
+    {
+        public string Inf_DAT;//信息
+        public UserInf()
+        {
+            InitializeComponent();           
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            INF_DATA.Text = Inf_DAT;
+        }
+
+        private void YES_Click(object sender, RoutedEventArgs e)//确认
+        {
+            this.Close(); //关闭窗口
+        }
+
+    }
+}