修改日程bug

Author: SamHou0

TimeControl/Data/Task.cs

@@ -30,13 +30,19 @@ public override string ToString()
         {
             return Name + " (" + Duration.Minutes + "min)";
         }
-
-        public void RunTask()
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns>If the task is ended</returns>
+        public bool RunTask()
         {
+            bool res = false;
             startTime = DateTime.Now;
             if (IsFocus)
             {
                 LockHelper.StartLock(Password.unlockPasswordHash, (int)Duration.TotalMinutes);
+                EndTask();
+                res = true;
             }
             else if (IsDeepFocus)
             {
@@ -45,11 +51,13 @@ public void RunTask()
             else
             {
                 MessageBox.Show(
-                    "任务已启动。该日程不需要启动任何计算机操作，请自行完成，预估时间" + Duration + "min");
+                    "任务已启动。该日程不需要启动任何计算机操作，请自行完成，预估时间", "提示"
+                    + Duration + "min", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
+            return res;
         }
 
-        public string EndTask()
+        private string EndTaskString()
         {
             if (startTime == new DateTime(0))
             {
@@ -58,5 +66,10 @@ public string EndTask()
             endTime = DateTime.Now;
             return ToString() + "(实际" + (endTime - startTime) + ")";
         }
+        public void EndTask()
+        {
+            MessageBox.Show(EndTaskString(),
+                "任务结束", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
     }
 }

TimeControl/Tools/LockHelper.cs

@@ -1,12 +1,14 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+using TimeControl.Data;
 using TimeControl.Windows;
 
 namespace TimeControl.Tools
 {
     internal class LockHelper
     {
+        public static TimeData TimeData;
         public static void StartLock(string unlockPasswordHash, int minutes)
         {
             IntPtr nowDesktop = Dllimport.GetThreadDesktop(Dllimport.GetCurrentThreadId());
@@ -24,6 +26,7 @@ public static void StartLock(string unlockPasswordHash, int minutes)
             }).Wait();
             Dllimport.SwitchDesktop(nowDesktop);
             Dllimport.CloseDesktop(newDesktop);
+            ShowAndSave(Lock.TempTimeSpan);
         }
 
         public static void Interrupt()
@@ -48,5 +51,12 @@ public static void StartDeepLock(int minutes)
             SystemControl.Shutdown();
             Application.Exit();
         }
+        public static void ShowAndSave(TimeSpan timeSpan)
+        {
+            ResultWindow resultWindow = new(timeSpan);
+            resultWindow.ShowDialog();
+            if (ResultWindow.IsSave == true)
+                TimeData.AddTime(timeSpan);
+        }
     }
 }

TimeControl/Windows/ControlPanel.cs

@@ -17,7 +17,6 @@ public partial class ControlPanel : Form
         private bool isClosable = false;
 
         private AppController appController;//Controller for list and apps.
-        private TimeData timeData;//The data of current aim.
         private bool isLoaded;//Show the state of initialization.
         private bool isChangeable = true;
         private List<Data.Task> tasks;
@@ -163,8 +162,7 @@ private void EndTaskButton_Click(object sender, EventArgs e)
         {
             if (taskListBox.SelectedIndex >= 0)
             {
-                MessageBox.Show(tasks[taskListBox.SelectedIndex].EndTask(),
-                    "任务结束", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                tasks[taskListBox.SelectedIndex].EndTask();
                 tasks.RemoveAt(taskListBox.SelectedIndex);
             }
             RefreshTasks();
@@ -174,7 +172,11 @@ private void TaskStartButton_Click(object sender, EventArgs e)
         {
             if (taskListBox.SelectedIndex >= 0)
             {
-                tasks[taskListBox.SelectedIndex].RunTask();
+                if (tasks[taskListBox.SelectedIndex].RunTask())
+                {
+                    tasks.RemoveAt(taskListBox.SelectedIndex);
+                }
+                RefreshTasks();
             }
         }
 
@@ -202,18 +204,11 @@ private void StartLock(string unlockPasswordHash, int minutes = 0)
         {
             LockHelper.StartLock(unlockPasswordHash, minutes);
             int index = dataGridView.Rows.Add();
-            ShowAndSave(Lock.TempTimeSpan);
-        }
-
-        private void ShowAndSave(TimeSpan timeSpan)
-        {
-            ResultWindow resultWindow = new(timeSpan);
-            resultWindow.ShowDialog();
-            if (ResultWindow.IsSave == true)
-                timeData.AddTime(timeSpan);
             RefreshAndSaveData();
         }
 
+
+
         private void WhiteProcessBox_TextChanged(object sender, EventArgs e)
         {
             File.WriteAllText(TCFile.WhiteAppLocation, whiteProcessBox.Text);
@@ -238,7 +233,7 @@ private void InitializeDeepFocus()
                 else
                 {
                     File.Delete(TCFile.DeepTempTimeFile);
-                    ShowAndSave(deepFocusTime);
+                    LockHelper.ShowAndSave(deepFocusTime);
                     RefreshAndSaveData();
                 }
             }
@@ -541,13 +536,13 @@ private void InitializeData()
         {
             if (File.Exists(TCFile.SavedData))
             {
-                timeData = TCFile.ReadTimeData();
+                LockHelper.TimeData = TCFile.ReadTimeData();
                 RefreshAndSaveData();
             }
             else
             {
                 Directory.CreateDirectory(TCFile.SavedDataDir);
-                timeData = new() { GoalName = "FirstGoal" };
+                LockHelper.TimeData = new() { GoalName = "FirstGoal" };
                 RefreshAndSaveData();
             }
         }
@@ -557,23 +552,23 @@ private void RefreshAndSaveData()
             //刷新列表
             //普通屏保
             dataGridView.Rows.Clear();
-            dataGridView.Rows.Add(timeData.LockTime, "普通屏保");
+            dataGridView.Rows.Add(LockHelper.TimeData.LockTime, "普通屏保");
             //深度专注屏保
-            dataGridView.Rows.Add(timeData.DeepLockTime, "深度专注屏保");
+            dataGridView.Rows.Add(LockHelper.TimeData.DeepLockTime, "深度专注屏保");
             //更新进度
-            ShowProgress(timeData);
+            ShowProgress();
             //保存
-            TCFile.SaveTimeData(timeData);
+            TCFile.SaveTimeData(LockHelper.TimeData);
         }
 
         #endregion DataPage
 
         #region ProgressPage
 
-        private void ShowProgress(TimeData timeData)
+        private void ShowProgress()
         {
-            goalLabel.Text = timeData.GoalName;
-            TimeSpan timeSpan = timeData.GetTimeSum();
+            goalLabel.Text = LockHelper.TimeData.GoalName;
+            TimeSpan timeSpan = LockHelper.TimeData.GetTimeSum();
             int level = 1;
             TimeSpan targetTimeSpan = new(0, 0, 0);
             while (level < 100)
@@ -593,7 +588,7 @@ private void ShowProgress(TimeData timeData)
             progressBar.Value = Convert.ToInt32((timeSpan / targetTimeSpan) * 100);
             if (level == 100)
             {
-                encourageLabel.Text = "恭喜通关！你可以通过删除TimeControl文件夹里的SavedData.xml来重新开始！";
+                encourageLabel.Text = "恭喜通关！你可以通过新建目标来重新开始！";
                 progressLabel.Visible = false;
                 progressBar.Value = 100;
             }