diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index 4ab8bf6..a7bfac0 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -197,6 +197,9 @@
InputBox.xaml
+
+ UserCall.xaml
+
ViewProgram.xaml
@@ -271,6 +274,10 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
Designer
MSBuild:Compile
@@ -413,6 +420,8 @@
+
+
diff --git a/Lmage/FxemojiBellcancellation.png b/Lmage/FxemojiBellcancellation.png
new file mode 100644
index 0000000..db67c1e
Binary files /dev/null and b/Lmage/FxemojiBellcancellation.png differ
diff --git a/Lmage/FxemojiRingingbell.png b/Lmage/FxemojiRingingbell.png
new file mode 100644
index 0000000..75e3f31
Binary files /dev/null and b/Lmage/FxemojiRingingbell.png differ
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 81120e6..6d5bc55 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -762,6 +762,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Muffling 的本地化字符串。
+ ///
+ public static string Muffling {
+ get {
+ return ResourceManager.GetString("Muffling", resourceCulture);
+ }
+ }
+
///
/// 查找类似 NAME 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 9b8c26a..4f5ee15 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -579,4 +579,7 @@
Total
+
+ Muffling
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 736a45d..eee7c01 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -579,4 +579,7 @@
Total
+
+ Muffling
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 3b42b6b..a49f355 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -579,4 +579,7 @@
总量
+
+ 静音
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 6e9ad93..21edd63 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -579,4 +579,7 @@
總量
+
+
+
\ No newline at end of file
diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs
index 280c171..91df483 100644
--- a/View/WorkOrderView.xaml.cs
+++ b/View/WorkOrderView.xaml.cs
@@ -145,8 +145,8 @@ namespace DyeingComputer.View
WorkOrder_new.Add("Dyelot", WorkOrder_Numder);
WorkOrder_new.Add("ProgramName", Process_Name);
WorkOrder_new.Add("StartTime", DateTime.Now.AddMinutes(1).ToString("yyyy/MM/dd HH:mm:ss"));
- WorkOrder_new.Add("EndTime", DateTime.Now.AddMinutes(DateTime.Parse(e.TIME).Minute +
- DateTime.Parse(e.TIME).Hour*60).ToString("yyyy/MM/dd HH:mm:ss"));
+ WorkOrder_new.Add("EndTime", (DateTime.Now.AddMinutes(1) +
+ TimeSpan.Parse(e.TIME)).ToString("yyyy/MM/dd HH:mm:ss"));
WorkOrder_new.Add("Time", e.TIME);
WorkOrder_new.Add("State", "101");
WorkOrder_new.Add("ProgramID", Process_id);
diff --git a/Windows/UserCall.xaml b/Windows/UserCall.xaml
new file mode 100644
index 0000000..35a2d4d
--- /dev/null
+++ b/Windows/UserCall.xaml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Windows/UserCall.xaml.cs b/Windows/UserCall.xaml.cs
new file mode 100644
index 0000000..0345e6b
--- /dev/null
+++ b/Windows/UserCall.xaml.cs
@@ -0,0 +1,66 @@
+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
+{
+ ///
+ /// ViewProgram.xaml 的交互逻辑
+ ///
+ public partial class UserCall : Window
+ {
+ DateTime times = DateTime.Now;
+ TimeSpan timeSpan5=new TimeSpan(0,0,0,5);
+
+ public UserCall()
+ {
+ InitializeComponent();
+ NOT.Visibility =Visibility.Collapsed;
+ Muffling_.IsEnabled = false;
+
+ DispatcherTimer disTimer = new DispatcherTimer
+ {
+ Interval = TimeSpan.FromMilliseconds(950) //毫秒
+ };
+ disTimer.Tick += DisTimer_1S;
+ disTimer.Start();//计时开始
+ }
+ void DisTimer_1S(object sender, EventArgs e)
+ {
+ TimeSpan timeSpan = DateTime.Now - times;
+ TIME_.Text = timeSpan.ToString(@"hh\:mm\:ss");
+
+ if (timeSpan>timeSpan5) Muffling_.IsEnabled=true;//5秒后允许禁英
+ }
+
+ private void YES_Click(object sender, RoutedEventArgs e)//确认
+ {
+ this.Close(); //关闭窗口
+ }
+
+ private void Muffling_Click(object sender, RoutedEventArgs e)//
+ {
+ NOT.Visibility = Visibility.Visible;
+ }
+
+ }
+}