bug fix

SamHou0 · SamHou0 · commit 7f9514f330d3 · 2022-01-09T12:22:46.000+08:00
diff --git a/TCSetup/TCSetup.vdproj b/TCSetup/TCSetup.vdproj
@@ -172,21 +172,21 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:TimeControl"
-        "ProductCode" = "8:{2BC11DA4-CD84-437D-A082-79AFF40F938A}"
-        "PackageCode" = "8:{4758052E-E293-4206-9BC6-5FE53A2FD9B8}"
+        "ProductCode" = "8:{0E4B2419-C67F-4087-B60D-68E342D1166C}"
+        "PackageCode" = "8:{C0B174F2-8D69-408C-BE9C-66606508CB47}"
         "UpgradeCode" = "8:{A7DC5BC4-7E3E-4B58-A0AD-3C9AC9F873C1}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.0.0"
+        "ProductVersion" = "8:3.0.1"
         "Manufacturer" = "8:SamHou"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
         "Title" = "8:TCSetup"
         "Subject" = "8:"
-        "ARPCONTACT" = "8:Default Company Name"
+        "ARPCONTACT" = "8:SamHou"
         "Keywords" = "8:"
         "ARPCOMMENTS" = "8:"
         "ARPURLINFOABOUT" = "8:"
@@ -722,7 +722,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B7C31D1C4E42443D89CA87F9596A43B7"
             {
-            "SourcePath" = "8:..\\TimeControl\\obj\\Release\\net6.0-windows10.0.22000.0\\apphost.exe"
+            "SourcePath" = "8:..\\TimeControl\\obj\\Debug\\net6.0-windows10.0.22000.0\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"
diff --git a/TimeControl/ControlPanel.Designer.cs b/TimeControl/ControlPanel.Designer.cs
diff --git a/TimeControl/ControlPanel.cs b/TimeControl/ControlPanel.cs
@@ -15,8 +15,8 @@ namespace TimeControl
 {
     public partial class ControlPanel : Form
     {
-        bool closable = false;
-        List<App> appList = new List<App>();
+        private bool closable = false;
+        List<App> appList = new();
         #region Dllimport
 
         [Flags]
@@ -118,7 +118,7 @@ public ControlPanel()
             InitializeComponent();
         }
 
-        private void startButton_Click(object sender, EventArgs e)
+        private void StartButton_Click(object sender, EventArgs e)
         {
             IntPtr nowDesktop = GetThreadDesktop(GetCurrentThreadId());
             IntPtr newDesktop = CreateDesktop("Lock", null, null, 0, ACCESS_MASK.GENERIC_ALL, IntPtr.Zero);
@@ -133,7 +133,7 @@ private void startButton_Click(object sender, EventArgs e)
             CloseDesktop(newDesktop);
         }
 
-        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
+        private void NotifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             Show();
         }
@@ -153,52 +153,62 @@ private void ExitToolStripMenuItem_Click(object sender, EventArgs e)
             Close();
         }
 
-        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             Process.Start("explorer.exe", "https://icons8.com/icon/19614/icon");
         }
 
-        private void backgroundProcessMonitor_DoWork(object sender, DoWorkEventArgs e)
-        {
-            while (true)
-            {
-                foreach (App app in appList)//计算进程时间
-                {
-                    if (Process.GetProcessesByName(app.Name).Length != 0)
-                    { app.Run(); }
-                }
-                Thread.Sleep(1000);
-            }
-        }
-
         private void ControlPanel_Load(object sender, EventArgs e)
         {
-            backgroundProcessMonitor.RunWorkerAsync();
+            processMonitorTimer.Start();
         }
-        
-        private void appAddButton_Click(object sender, EventArgs e)//添加打开的窗口
+
+        private void AppAddButton_Click(object sender, EventArgs e)//添加打开的窗口
         {
+            processMonitorTimer.Stop();
             appList.Clear();
             Process[] processes = Process.GetProcesses();
             foreach (Process process in processes)
             {
                 if (!string.IsNullOrEmpty(process.MainWindowTitle))
                 {
-                    appList.Add(new App(process.ProcessName, process.MainModule.FileName));
+                    try
+                    {
+                        appList.Add(new App(process.ProcessName, process.MainModule.FileName));
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message,"错误",MessageBoxButtons.OK,MessageBoxIcon.Error);//防止无法访问错误
+                    }
                 }
             }
-            ListBoxController.Refresh(usageBox, appList);
+            CalculateTime();
         }
 
-        private void removeButton_Click(object sender, EventArgs e)//移除所有的已添加窗口
+        private void RemoveButton_Click(object sender, EventArgs e)//移除所有的已添加窗口
         {
             appList.Clear();
-            ListBoxController.Refresh(usageBox, appList);
+            CalculateTime();
+        }
+
+        private void RefreshButton_Click(object sender, EventArgs e)//重新获取所有软件所用时间
+        {
+            CalculateTime();
         }
 
-        private void refreshButton_Click(object sender, EventArgs e)//重新获取所有软件所用时间
+        private void ProcessMonitorTimer_Tick(object sender, EventArgs e)
+        {
+            foreach (App app in appList)//计算进程时间
+            {
+                if (Process.GetProcessesByName(app.Name).Length != 0)
+                { app.Run(); }
+            }
+        }
+        private void CalculateTime()//将进程时间推送到ListBox控件
         {
+            processMonitorTimer.Stop();
             ListBoxController.Refresh(usageBox, appList);
+            processMonitorTimer.Start();
         }
     }
 }
diff --git a/TimeControl/ControlPanel.resx b/TimeControl/ControlPanel.resx
@@ -159,8 +159,8 @@
         A///wAP//8AD//8AAP//AAD//+AH////////////
 </value>
   </data>
-  <metadata name="backgroundProcessMonitor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>337, 17</value>
+  <metadata name="processMonitorTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>374, 20</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/TimeControl/TimeControl.csproj b/TimeControl/TimeControl.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Authors>SamHou</Authors>
-    <Version>3.0.0</Version>
+    <Version>3.0.1</Version>
     <StartupObject>TimeControl.Program</StartupObject>
     <AssemblyVersion></AssemblyVersion>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ namespace TimeControl`
`15`	`15`	`{`
`16`	`16`	`public partial class ControlPanel : Form`
`17`	`17`	`{`
`18`		`- bool closable = false;`
`19`		`- List<App> appList = new List<App>();`
	`18`	`+ private bool closable = false;`
	`19`	`+ List<App> appList = new();`
`20`	`20`	`#region Dllimport`
`21`	`21`
`22`	`22`	`[Flags]`
`@@ -118,7 +118,7 @@ public ControlPanel()`
`118`	`118`	`InitializeComponent();`
`119`	`119`	`}`
`120`	`120`
`121`		`- private void startButton_Click(object sender, EventArgs e)`
	`121`	`+ private void StartButton_Click(object sender, EventArgs e)`
`122`	`122`	`{`
`123`	`123`	`IntPtr nowDesktop = GetThreadDesktop(GetCurrentThreadId());`
`124`	`124`	`IntPtr newDesktop = CreateDesktop("Lock", null, null, 0, ACCESS_MASK.GENERIC_ALL, IntPtr.Zero);`
`@@ -133,7 +133,7 @@ private void startButton_Click(object sender, EventArgs e)`
`133`	`133`	`CloseDesktop(newDesktop);`
`134`	`134`	`}`
`135`	`135`
`136`		`- private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)`
	`136`	`+ private void NotifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)`
`137`	`137`	`{`
`138`	`138`	`Show();`
`139`	`139`	`}`
`@@ -153,52 +153,62 @@ private void ExitToolStripMenuItem_Click(object sender, EventArgs e)`
`153`	`153`	`Close();`
`154`	`154`	`}`
`155`	`155`
`156`		`- private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)`
	`156`	`+ private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)`
`157`	`157`	`{`
`158`	`158`	`Process.Start("explorer.exe", "https://icons8.com/icon/19614/icon");`
`159`	`159`	`}`
`160`	`160`
`161`		`- private void backgroundProcessMonitor_DoWork(object sender, DoWorkEventArgs e)`
`162`		`- {`
`163`		`- while (true)`
`164`		`- {`
`165`		`- foreach (App app in appList)//计算进程时间`
`166`		`- {`
`167`		`- if (Process.GetProcessesByName(app.Name).Length != 0)`
`168`		`- { app.Run(); }`
`169`		`- }`
`170`		`- Thread.Sleep(1000);`
`171`		`- }`
`172`		`- }`
`173`		`-`
`174`	`161`	`private void ControlPanel_Load(object sender, EventArgs e)`
`175`	`162`	`{`
`176`		`- backgroundProcessMonitor.RunWorkerAsync();`
	`163`	`+ processMonitorTimer.Start();`
`177`	`164`	`}`
`178`		`-`
`179`		`- private void appAddButton_Click(object sender, EventArgs e)//添加打开的窗口`
	`165`	`+`
	`166`	`+ private void AppAddButton_Click(object sender, EventArgs e)//添加打开的窗口`
`180`	`167`	`{`
	`168`	`+ processMonitorTimer.Stop();`
`181`	`169`	`appList.Clear();`
`182`	`170`	`Process[] processes = Process.GetProcesses();`
`183`	`171`	`foreach (Process process in processes)`
`184`	`172`	`{`
`185`	`173`	`if (!string.IsNullOrEmpty(process.MainWindowTitle))`
`186`	`174`	`{`
`187`		`- appList.Add(new App(process.ProcessName, process.MainModule.FileName));`
	`175`	`+ try`
	`176`	`+ {`
	`177`	`+ appList.Add(new App(process.ProcessName, process.MainModule.FileName));`
	`178`	`+ }`
	`179`	`+ catch (Exception ex)`
	`180`	`+ {`
	`181`	`+ MessageBox.Show(ex.Message,"错误",MessageBoxButtons.OK,MessageBoxIcon.Error);//防止无法访问错误`
	`182`	`+ }`
`188`	`183`	`}`
`189`	`184`	`}`
`190`		`- ListBoxController.Refresh(usageBox, appList);`
	`185`	`+ CalculateTime();`
`191`	`186`	`}`
`192`	`187`
`193`		`- private void removeButton_Click(object sender, EventArgs e)//移除所有的已添加窗口`
	`188`	`+ private void RemoveButton_Click(object sender, EventArgs e)//移除所有的已添加窗口`
`194`	`189`	`{`
`195`	`190`	`appList.Clear();`
`196`		`- ListBoxController.Refresh(usageBox, appList);`
	`191`	`+ CalculateTime();`
	`192`	`+ }`
	`193`	`+`
	`194`	`+ private void RefreshButton_Click(object sender, EventArgs e)//重新获取所有软件所用时间`
	`195`	`+ {`
	`196`	`+ CalculateTime();`
`197`	`197`	`}`
`198`	`198`
`199`		`- private void refreshButton_Click(object sender, EventArgs e)//重新获取所有软件所用时间`
	`199`	`+ private void ProcessMonitorTimer_Tick(object sender, EventArgs e)`
	`200`	`+ {`
	`201`	`+ foreach (App app in appList)//计算进程时间`
	`202`	`+ {`
	`203`	`+ if (Process.GetProcessesByName(app.Name).Length != 0)`
	`204`	`+ { app.Run(); }`
	`205`	`+ }`
	`206`	`+ }`
	`207`	`+ private void CalculateTime()//将进程时间推送到ListBox控件`
`200`	`208`	`{`
	`209`	`+ processMonitorTimer.Stop();`
`201`	`210`	`ListBoxController.Refresh(usageBox, appList);`
	`211`	`+ processMonitorTimer.Start();`
`202`	`212`	`}`
`203`	`213`	`}`
`204`	`214`	`}`