添加取样页面及相关资源

DyeingComputer.csproj

@@ -197,6 +197,9 @@
     <Compile Include="Windows\InputBox.xaml.cs">
       <DependentUpon>InputBox.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Windows\Sampling.xaml.cs">
+      <DependentUpon>Sampling.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\UserCall.xaml.cs">
       <DependentUpon>UserCall.xaml</DependentUpon>
     </Compile>
@@ -274,6 +277,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Windows\Sampling.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Windows\UserCall.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -420,6 +427,7 @@
     <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\StreamlineUltimateColorColorPaletteSample1.png" />
     <Resource Include="Lmage\FxemojiBellcancellation.png" />
     <Resource Include="Lmage\FxemojiRingingbell.png" />
     <Resource Include="Lmage\IconParkMessages.png" />

Properties/Resources.Designer.cs

@@ -78,6 +78,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add 的本地化字符串。
+        /// </summary>
+        public static string ADD {
+            get {
+                return ResourceManager.GetString("ADD", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 AddTheMedicine 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -582,4 +582,7 @@
   <data name="Muffling" xml:space="preserve">
     <value>Muffling</value>
   </data>
+  <data name="ADD" xml:space="preserve">
+    <value>Add</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -582,4 +582,7 @@
   <data name="Muffling" xml:space="preserve">
     <value>Muffling</value>
   </data>
+  <data name="ADD" xml:space="preserve">
+    <value>Add</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -582,4 +582,7 @@
   <data name="Muffling" xml:space="preserve">
     <value>静音</value>
   </data>
+  <data name="ADD" xml:space="preserve">
+    <value>加色</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -582,4 +582,7 @@
   <data name="Muffling" xml:space="preserve">
     <value />
   </data>
+  <data name="ADD" xml:space="preserve">
+    <value />
+  </data>
 </root>

ViewModel/MainWindowViewModel.cs

@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.Input;
 using DyeingComputer.Properties;
 using DyeingComputer.UserClass;
 using DyeingComputer.View;
+using DyeingComputer.Windows;
 using Microsoft.Win32;
 using Newtonsoft.Json.Linq;
 using NModbus;
@@ -82,6 +83,7 @@ namespace DyeingComputer.ViewModel
         public static UInt32 TX = 0;
         public static int UserInfoStart = 900;
         public static string UserInfo;
+        public static bool UserCall_OK = false;
         public ICommand ProgramgroupView_stop { get; }
         bool _isInteractive;
         public bool IsInteractive//步骤表交互选择
@@ -306,6 +308,8 @@ namespace DyeingComputer.ViewModel
         public static string S06;//通讯编码
         public static int S16;//风机联动
         public static int S17;//
+        public static int S19;//
+        public static int S20;//
         public static int SM01;//副缸
         public static int SM02;//副缸
         public static int SM03;//副缸
@@ -363,6 +367,8 @@ namespace DyeingComputer.ViewModel
             S05 = Selet_sys("S05");//
             S06 = Selet_sys("S06");//
             S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息
+            S19 = Convert.ToInt16(Selet_sys("S19"));//工作信息
+            S20 = Convert.ToInt16(Selet_sys("S20"));//工作信息
             MI01 = Convert.ToInt16(Selet_sys("MI01"));//工作信息
             MI02 = Convert.ToInt16(Selet_sys("MI02"));//工作信息
             MI03 = Convert.ToInt16(Selet_sys("MI03"));//工作信息
@@ -653,6 +659,10 @@ namespace DyeingComputer.ViewModel
         static Dictionary<string, object> updata_RUN = new Dictionary<string, object>();//
         public static void STEP_START(string ID, double P1, double P2, double P3, double P4, double P5) //启动模块
         {
+            UserCall userCall = new UserCall();
+            userCall.Topmost = true;
+            userCall.CALL_time= S19;
+
             STEP_ID = ID;
             switch (ID)
             {
@@ -711,30 +721,40 @@ namespace DyeingComputer.ViewModel
                     STEP_finish = false;
                     break;
                 case "035":
+                    userCall.Inf_DAT = Resources.ClothIntake;
+                    userCall.Show();
                     STEP_TIME = Convert.ToInt32(MU01);
                     SETP_runtime = true;
                     STEP_finish = false;
                     break;
                 case "036":
+                    userCall.Show();
                     STEP_TIME = Convert.ToInt32(MU01);
                     SETP_runtime = true;
                     STEP_finish = false;
                     break;
                 case "039":
+                    userCall.Show();
                     STEP_TIME = Convert.ToInt32(MU01);
                     SETP_runtime = true;
                     STEP_finish = false;
                     break;
                 case "040":
+                    Sampling sampling = new Sampling();
+                    sampling.Topmost = true;
+                    sampling.CALL_time = S20;
+                    sampling.Show();
                     STEP_TIME = Convert.ToInt32(MU01);
                     SETP_runtime = true;
                     STEP_finish = false;
                     break;
                 case "041":
+                    userCall.Show();
                     SETP_runtime = false;
                     STEP_finish = false;
                     break;
                 case "049":
+                    userCall.Show();
                     STEP_TIME = Convert.ToInt32(MU01);
                     SETP_runtime = true;
                     STEP_finish = false;
@@ -1131,8 +1151,9 @@ namespace DyeingComputer.ViewModel
                             }
                             break;//运转时间
                         case "035":
-                            if (Selet_dtd("2004"))
+                            if (Selet_dtd("2004")|| UserCall_OK)
                             {
+                                UserCall_OK = false;
                                 STEP_finish = true;
                                 Alert_yellow = false;
                             }
@@ -1152,8 +1173,9 @@ namespace DyeingComputer.ViewModel
                             if (errTabler.Rows.Count == 0) Status_Str = Resources.ClothIntake;
                             break;//准备入布
                         case "036":
-                            if (Selet_dtd("2004"))
+                            if (Selet_dtd("2004")|| UserCall_OK)
                             {
+                                UserCall_OK=false;
                                 STEP_finish = true;
                                 Alert_yellow = false;
                             }
@@ -1173,8 +1195,9 @@ namespace DyeingComputer.ViewModel
                             if (errTabler.Rows.Count == 0) Status_Str = Resources.OutTheCloth;
                             break;//准备出布
                         case "039":
-                            if (Selet_dtd("2004"))
+                            if (Selet_dtd("2004")|| UserCall_OK)
                             {
+                                UserCall_OK = false;
                                 STEP_finish = true;
                                 Alert_yellow = false;
                             }
@@ -1194,8 +1217,9 @@ namespace DyeingComputer.ViewModel
                             if (errTabler.Rows.Count == 0) Status_Str = Resources.CallWorkers;
                             break;//呼叫人工
                         case "040":
-                            if (Selet_dtd("2004"))
+                            if (Selet_dtd("2004")|| UserCall_OK)
                             {
+                                UserCall_OK = false;
                                 STEP_finish = true;
                                 Alert_yellow = false;
                             }
@@ -1219,8 +1243,9 @@ namespace DyeingComputer.ViewModel
                             if (errTabler.Rows.Count == 0) Status_Str = Resources.End;
                             break;//结束
                         case "049":
-                            if (Selet_dtd("2004"))
+                            if (Selet_dtd("2004")|| UserCall_OK)
                             {
+                                UserCall_OK = false;
                                 STEP_finish = true;
                                 Alert_yellow = false;
                             }

Windows/Sampling.xaml

@@ -0,0 +1,29 @@
+<Window x:Class="DyeingComputer.Windows.Sampling"
+        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:DyeingComputer.Windows"
+        xmlns:lang="clr-namespace:DyeingComputer.Properties" 
+        WindowStartupLocation="CenterScreen"
+        Loaded ="Window_Loaded"
+        ResizeMode="NoResize"
+        mc:Ignorable="d"
+        Title="SUNLIGHT 800" Height="200" Width="400">
+    <Grid>
+        <Image x:Name="NOT" Height="100" Width="100" VerticalAlignment="Bottom" FlowDirection="LeftToRight" 
+               HorizontalAlignment="Left" Margin="25,0,0,27" Source="/Lmage/StreamlineUltimateColorColorPaletteSample1.png"/>
+   
+        <TextBox x:Name="TIME_" HorizontalAlignment="Right" Height="40" Margin="0,0,20,80"         
+            TextWrapping="Wrap" VerticalAlignment="Bottom" Width="134" FontSize="30" IsReadOnly="True" 
+            BorderBrush="{x:Null}" />
+        <TextBox HorizontalAlignment="Right" Height="40" Margin="0,0,150,80" Text="{x:Static lang:Resources.Sampling}"           
+                 TextWrapping="Wrap" VerticalAlignment="Bottom" Width="80" FontSize="25" IsReadOnly="True" 
+                 Background="{x:Null}" Foreground="Black" BorderBrush="{x:Null}" />
+
+        <Button Content="{x:Static lang:Resources.ADD}" HorizontalAlignment="Right" Height="35" Margin="50,70,150,20" 
+                VerticalAlignment="Bottom" Width="80" Click="ADD_Click" Name="ADD_"/>
+        <Button Content="{x:Static lang:Resources.Confirm}" HorizontalAlignment="Right" Height="35" Margin="50,70,20,20" 
+                VerticalAlignment="Bottom" Width="80" Click="Confirm_Click" x:Name="Confirm_"/>
+    </Grid>
+</Window>

Windows/Sampling.xaml.cs

@@ -0,0 +1,75 @@
+using DyeingComputer.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 DyeingComputer.UserClass.SqliteHelper;
+using static DyeingComputer.Windows.ViewStep;
+
+namespace DyeingComputer.Windows
+{
+    /// <summary>
+    /// ViewProgram.xaml 的交互逻辑
+    /// </summary>
+    public partial class Sampling : Window
+    {
+        DateTime times = DateTime.Now;
+        TimeSpan timeSpan;
+        public int CALL_time = 60;
+        public Sampling()
+        {
+            InitializeComponent();           
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            NOT.Visibility = Visibility.Collapsed;
+            Confirm_.IsEnabled = false;
+            ADD_.IsEnabled = false;
+            timeSpan = new TimeSpan(0, 0, 0, CALL_time);
+            DispatcherTimer disTimer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(950) //毫秒
+            };
+            disTimer.Tick += DisTimer_1S;
+            disTimer.Start();//计时开始
+        }
+        void DisTimer_1S(object sender, EventArgs e) 
+        {
+            TimeSpan timeSpanT = DateTime.Now - times;
+            TIME_.Text = timeSpanT.ToString(@"hh\:mm\:ss");
+
+            if (timeSpanT > timeSpan)
+            {
+                Confirm_.IsEnabled = true; 
+                ADD_.IsEnabled = true;
+            }
+        }
+
+        private void Confirm_Click(object sender, RoutedEventArgs e)//确认
+        {
+
+        }
+
+        private void ADD_Click(object sender, RoutedEventArgs e)//                                                               
+        {
+
+        }
+
+    }
+}

Windows/UserCall.xaml

@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:DyeingComputer.Windows"
         xmlns:lang="clr-namespace:DyeingComputer.Properties" 
         WindowStartupLocation="CenterScreen"
+        Loaded ="Window_Loaded"
         ResizeMode="NoResize"
         mc:Ignorable="d"
         Title="SUNLIGHT 800" Height="400" Width="400">

Windows/UserCall.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using DyeingComputer.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
@@ -29,14 +30,18 @@ namespace DyeingComputer.Windows
     public partial class UserCall : Window
     {
         DateTime times = DateTime.Now;
-        TimeSpan timeSpan5=new TimeSpan(0,0,0,5);
+        TimeSpan timeSpan5;
-
+        public string Inf_DAT;//信息
+        public int CALL_time = 5;//
         public UserCall()
         {
-            InitializeComponent();
+            InitializeComponent();           
-            NOT.Visibility =Visibility.Collapsed;
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            NOT.Visibility = Visibility.Collapsed;
             Muffling_.IsEnabled = false;
-
+            timeSpan5 = new TimeSpan(0, 0, 0, CALL_time);
             DispatcherTimer disTimer = new DispatcherTimer
             {
                 Interval = TimeSpan.FromMilliseconds(950) //毫秒
@@ -50,10 +55,13 @@ namespace DyeingComputer.Windows
             TIME_.Text = timeSpan.ToString(@"hh\:mm\:ss");
 
             if (timeSpan>timeSpan5) Muffling_.IsEnabled=true;//5秒后允许禁英
+
+            INF_DATA.Text = Inf_DAT;
         }
 
         private void YES_Click(object sender, RoutedEventArgs e)//确认
         {
+            MainWindowViewModel.UserCall_OK = true;
             this.Close(); //关闭窗口
         }