Merge pull request #21 from NaroZeol/work

各种更新

README.md

@@ -1,3 +1,8 @@
 从西南交通大学官方网站获取通知，目前实现对教务网，计院官网，扬华素质网的支持。
 
-目前主要维护.net 8.0版本，随缘更新Framework 4.8版本
+目前主要维护.net 8.0版本，随缘更新Framework 4.8版本
+
+图标来源于 [iconfinder](https://www.iconfinder.com/) 
+
+- [常规图标](https://www.iconfinder.com/icons/5173002/alarm_alert_bell_internet_notice_notification_security_icon)
+- [通知图标](https://www.iconfinder.com/icons/3993856/alert_bell_notice_notifications_notify_icon)

dotnet8.0/Program/Program.cs

@@ -11,18 +11,19 @@ internal static class Program
 
         static void Main()
         {
-            string? proGramName = Assembly.GetExecutingAssembly().GetName().Name;
-
-            using Mutex mutex = new(false, proGramName, out bool createdNew);
-            if (!createdNew)
+            //用于确保只有一个实例在运行
+            string mutexName = "MutexForGetNoticeFromSWJTU";
+            Mutex mutex = new Mutex(false, mutexName, out bool isCreateNew);
+            if (!isCreateNew)
             {
-                return;
+                MessageBox.Show(null, "已存在一个运行实例", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Environment.Exit(1);
             }
 
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new Form1());
+            Application.Run(new MainForm());
         }
     }
 }

dotnet8.0/Program/Program.csproj

@@ -6,11 +6,11 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ApplicationIcon>Normal.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\icons\Normal.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="Normal.ico" />
+    <Content Include="Resources\icons\Normal.ico" />
   </ItemGroup>
 
   <ItemGroup>

dotnet8.0/Program/Properties/Resources.resx

@@ -119,9 +119,9 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Normal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon\Normal.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\Normal.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="OnNotify" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon\OnNotify.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\OnNotify.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

dotnet8.0/Program/src/File/FIleData.cs

@@ -26,27 +26,25 @@ public static string CheckDiff(string newText, string oldText)
         {
             return newText;
         }
-        List<string> newTextList = newText.Split('\n').ToList();
-        List<string> oldTextList = oldText.Split('\n').ToList();
-
-        string ret = "";
-        int indexOfNewText = 0;
-        int indexOfOldText = 0;
 
-        while (indexOfNewText < newTextList.Count && indexOfOldText < oldTextList.Count)
+        HashSet<string> newTextSet = new HashSet<string>(newText.Split('\n').ToList());
+        HashSet<string> oldTextSet = new HashSet<string>(oldText.Split('\n').ToList());
+
+        string ret = "";
+        int i = 0;
+        foreach (string line in newTextSet)
         {
-            if (newTextList[indexOfNewText] == oldTextList[indexOfOldText])
+            if (!oldTextSet.Contains(line))
             {
-                indexOfNewText++;
-                indexOfOldText++;
-            }
-            else
-            {
-                ret += newTextList[indexOfNewText] + "\n";
-                indexOfNewText++;
+                ret += line + "\n";
+                i += 1;
+                if (i % 2 == 0)
+                {
+                    ret += "\n";
+                }
             }
         }
-
+           
         return ret.TrimEnd();
     }
 }