修复了预提醒在启用了"不要提醒"后仍然弹出的问题

Planshit · Sep 28, 2019 · 828a7e8 · 828a7e8
1 parent 65cf034
commit 828a7e8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/ProjectEye/Core/Service/MainService.cs b/src/ProjectEye/Core/Service/MainService.cs
@@ -74,6 +74,14 @@ public class MainService : IService
         /// 到达休息时间时发生（不管是否进入休息状态）
         /// </summary>
         public event MainEventHandler OnReset;
+        /// <summary>
+        /// 计时器停止时发生
+        /// </summary>
+        public event MainEventHandler OnPause;
+        /// <summary>
+        /// 计时器启动时发生
+        /// </summary>
+        public event MainEventHandler OnStart;
         #endregion
         public MainService(App app,
             ScreenService screen,
@@ -341,6 +349,7 @@ private void DoStart()
                 //用眼统计
                 useeye_timer.Start();
             }
+            OnStart?.Invoke(this, 0);
         }
         #endregion
 
@@ -353,7 +362,7 @@ private void DoStop()
 
             back_timer.Stop();
 
-
+            OnPause?.Invoke(this, 0);
         }
         #endregion
 

diff --git a/src/ProjectEye/Core/Service/PreAlertService.cs b/src/ProjectEye/Core/Service/PreAlertService.cs
@@ -110,6 +110,8 @@ public PreAlertService(ConfigService config,
             main.OnReset += Main_OnReset;
             main.OnLeaveEvent += Main_OnLeaveEvent;
             main.OnComeBackEvent += Main_OnComeBackEvent;
+            main.OnPause += Main_OnPause;
+            main.OnStart += Main_OnStart;
             config.Changed += Config_Changed;
             reset.ResetStart += Reset_ResetStart;
             reset.ResetCompleted += Reset_ResetCompleted;
@@ -118,6 +120,23 @@ public PreAlertService(ConfigService config,
             preAlertTimer.Tick += new EventHandler(preAlertTimer_Tick);
         }
 
+        private void Main_OnStart(object service, int msg)
+        {
+            if (config.options.Style.IsPreAlert)
+            {
+                InitPreAlert();
+            }
+
+        }
+
+        private void Main_OnPause(object service, int msg)
+        {
+            if (config.options.Style.IsPreAlert && preAlertTimer.IsEnabled)
+            {
+                preAlertTimer.Stop();
+            }
+        }
+
         private void Main_OnComeBackEvent(object service, int msg)
         {
             if (config.options.Style.IsPreAlert)

diff --git a/src/ProjectEye/Properties/AssemblyInfo.cs b/src/ProjectEye/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0")]
+[assembly: AssemblyVersion("1.1.1")]
 [assembly: AssemblyFileVersion("1.0.0.1")]