提交代码

货架标准上位机/WarningManager.cs

@@ -23,27 +23,39 @@ namespace 货架标准上位机
         {
             lock (flag)
             {
-                warnings.Add(WarningWindow.Show(warningModel.WarningMessage, "报警信息",  warningModel));
+                Logs.Write($"【添加报警信息弹窗】报警类型：{warningModel.WarningType} 报警信息:{warningModel.WarningMessage} Guid:{warningModel.Guid}", LogsType.WebSocket);
+                Application.Current.Dispatcher.Invoke(new Action(() =>
+                {
+                    warnings.Add(WarningWindow.Show(warningModel.WarningMessage, "报警信息", warningModel));
+                }));
             }
-
         }
 
         public static void RemoveWarning(Guid guid)
         {
-            lock(flag)
+            lock (flag)
             {
+
                 try
                 {
-                    var warning = warnings.Where(t => t.warning.Guid == guid).First();
-                    Application.Current.Dispatcher.Invoke(new Action(() =>
+                    var warningWindow = warnings.Where(t => t.warning.Guid == guid).First();
+                    if (warningWindow != null)
                     {
-                        warning?.Close();
-                        warnings.Remove(warning);
-                    }));
+                        Logs.Write($"【移除报警信息弹窗】报警类型：{warningWindow.warning.WarningType} 报警信息:{warningWindow.warning.WarningMessage} Guid:{warningWindow.warning.Guid}", LogsType.WebSocket);
+                        Application.Current.Dispatcher.Invoke(new Action(() =>
+                        {
+                            warningWindow?.Close();
+                            warnings.Remove(warningWindow);
+                        }));
+                    }
+                    else
+                    {
+                        Logs.Write($"【移除报警信息弹窗失败】Guid为:{guid}的窗体未找到！");
+                    }
                 }
-                catch 
-                { 
-                
+                catch
+                {
+
                 }
             }
         }