From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点
---
HMI.AlermInfoManage/AlarmInfoManage.xaml.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs b/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs
index 19006db..02cb527 100644
--- a/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs
+++ b/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs
@@ -315,7 +315,14 @@
{
try
{
- AlarmTexts = XmlHelper.DeserializeFromXml<ObservableCollection<AlarmText>>(alarmTextPath);
+ if (string.IsNullOrEmpty(alarmTextPath) || !File.Exists(alarmTextPath))
+ {
+ AlarmTexts = new ObservableCollection<AlarmText>();
+ }
+ else
+ {
+ AlarmTexts = XmlHelper.DeserializeFromXml<ObservableCollection<AlarmText>>(alarmTextPath);
+ }
}
catch (Exception ex)
{
@@ -323,8 +330,6 @@
AlarmTexts = new ObservableCollection<AlarmText>();
}
}
-
-
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
@@ -339,6 +344,11 @@
Loaded -= UserControl_Loaded;
}
+ public override void DoClose(object sender, EventArgs e)
+ {
+ // AlarmUtil.OnAlarm -= AlarmUtil_OnAlarm;
+ }
+
//private void MonitorTimer_Elapsed_bak(object sender, ElapsedEventArgs e)
//{
// try
--
Gitblit v1.9.1