优化代码

SugarWorkshop · Jan 23, 2021 · c274636 · c274636
1 parent 1ba210b
commit c274636
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 64 deletions.
diff --git a/src/Constants.cs b/src/Constants.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using System.Windows.Forms;
 
 namespace SeewoHelper
 {
@@ -8,6 +9,11 @@ namespace SeewoHelper
     /// </summary>
     public static class Constants
     {
+        /// <summary>
+        /// 应用名称
+        /// </summary>
+        public static readonly string AppName = Application.ProductName;
+
         /// <summary>
         /// 贡献者
         /// 若有贡献请修改该字段

diff --git a/src/Forms/WindowMain.Designer.cs b/src/Forms/WindowMain.Designer.cs
diff --git a/src/Program.cs b/src/Program.cs
@@ -9,7 +9,7 @@ namespace SeewoHelper
 {
     static class Program
     {
-        public static Logger Logger { get; private set; }
+        public static Logger Logger { get; private set; } = new Logger(Path.Combine(Constants.BaseDirectory, "logs", DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + ".log"));
 
         public static FormStyleController FormStyleController { get; } = new FormStyleController();
 
@@ -19,13 +19,12 @@ static class Program
         [STAThread]
         static void Main()
         {
-            var instance = InstanceUtilities.GetRunningInstance();
+            using var mutex = new Mutex(true, Constants.AppName, out bool createdNew);
 
-            if (instance == null)
-            {
-                Logger = new Logger(Path.Combine(Constants.BaseDirectory, "logs", DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + ".log"));
-                FormStyleController.SetStyle(Configurations.UISettings.Content.Style);
+            FormStyleController.SetStyle(Configurations.UISettings.Content.Style);
 
+            if (createdNew)
+            {
                 Application.ThreadException += Application_ThreadException; // 处理主线程的异常
                 AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; // 处理子线程未捕获异常
 

diff --git a/src/Utilities/InstanceUtilities.cs b/src/Utilities/InstanceUtilities.cs
diff --git a/src/Utilities/MessageBoxUtilities.cs b/src/Utilities/MessageBoxUtilities.cs
@@ -2,13 +2,14 @@
 
 namespace SeewoHelper.Utilities
 {
-    public class MessageBoxUtilities
+    public static class MessageBoxUtilities
     {
         /// <summary>
         /// 显示提示框
         /// </summary>
         public static bool Show(string text, string caption, bool showMask = false, UIMessageBoxButtons buttons = UIMessageBoxButtons.OK)
         {
+            Program.Logger.Add($"显示消息框，参数：[text: {text}, caption: {caption}, showMask: {showMask}, buttons: {buttons}]");
             return UIMessageBox.Show(text, caption, Program.FormStyleController.CurrentStyle, buttons, showMask);
         }
 
@@ -17,7 +18,6 @@ public static bool Show(string text, string caption, bool showMask = false, UIMe
         /// </summary>
         public static bool ShowAsk(string text, bool showMask = false)
         {
-            Program.Logger.Add($"弹出询问信息提示框 , text = {text} , showMask = {showMask}");
             return Show(text, "询问", showMask, UIMessageBoxButtons.OKCancel);
         }
 
@@ -26,7 +26,6 @@ public static bool ShowAsk(string text, bool showMask = false)
         /// </summary>
         public static void ShowError(string text, bool showMask = false)
         {
-            Program.Logger.Add($"弹出错误信息提示框 , text = {text} , showMask = {showMask}");
             Show(text, "错误", showMask);
         }
 
@@ -35,7 +34,6 @@ public static void ShowError(string text, bool showMask = false)
         /// </summary>
         public static void ShowInfo(string text, bool showMask = false)
         {
-            Program.Logger.Add($"弹出信息提示框 , text = {text} , showMask = {showMask}");
             Show(text, "提示", showMask);
         }
 
@@ -44,7 +42,6 @@ public static void ShowInfo(string text, bool showMask = false)
         /// </summary>
         public static void ShowSuccess(string text, bool showMask = false)
         {
-            Program.Logger.Add($"弹出成功信息提示框 , text = {text} , showMask = {showMask}");
             Show(text, "成功", showMask);
         }
 
@@ -53,7 +50,6 @@ public static void ShowSuccess(string text, bool showMask = false)
         /// </summary>
         public static void ShowWarning(string text, bool showMask = false)
         {
-            Program.Logger.Add($"弹出警告信息提示框 , text = {text} , showMask = {showMask}");
             Show(text, "警告", showMask);
         }
     }