From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
HMI.Core/Util/PathHelper.cs | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/HMI.Core/Util/PathHelper.cs b/HMI.Core/Util/PathHelper.cs
index ad80093..092287d 100644
--- a/HMI.Core/Util/PathHelper.cs
+++ b/HMI.Core/Util/PathHelper.cs
@@ -50,16 +50,8 @@
/// </summary>
public static string ParameterDataPath { get; private set; }
- /// <summary>
- /// 浜у搧鏁版嵁鐩綍
- /// </summary>
- public static string ProductDataFolder { get; private set; }
- public static string ProductParameterFolder { get; private set; }
-
- /// <summary>
- /// 浜у搧鏁版嵁婧愭枃浠�
- /// </summary>
- public static string ProductDataFile { get; private set; }
+
+
/// <summary>
/// 娴嬭瘯椤规暟鎹洰褰�
@@ -94,11 +86,11 @@
ParameterFolder = InitFolder(ConfigFolder + "\\Parameter");
ParameterDataPath = ParameterFolder + "\\CommonParameter.data";
- ProductDataFolder = InitFolder(ConfigFolder + "\\Product");
- ProductParameterFolder = InitFolder(ProductDataFolder + "\\Parameter");
- ProductDataFile = ProductDataFolder + "\\Product.data";
+ //ProductDataFolder = InitFolder(ConfigFolder + "\\Product");
+ //ProductParameterFolder = InitFolder(ProductDataFolder + "\\Parameter");
+ //ProductDataFile = ProductDataFolder + "\\Product.data";
- TestItemDataFolder = InitFolder(ProductDataFolder + "\\TestItem");
+ // TestItemDataFolder = InitFolder(ProductDataFolder + "\\TestItem");
TestItemDataFile = TestItemDataFolder + "\\TestItem.data";
LogViewerDir = InitFolder(ConfigFolder + "\\LogViewer");
@@ -155,6 +147,18 @@
return Path;
}
+ public static string BlockAlarmSettingPath()
+ {
+ string Path = RootPath() + "\\Config\\AlarmInfo\\BlockSetting.xml";
+ return Path;
+ }
+
+ public static string MarkAlarmSettingPath()
+ {
+ string Path = RootPath() + "\\Config\\AlarmInfo\\MarkSetting.xml";
+ return Path;
+ }
+
/// <summary>
/// 鎻掍欢瀛樺偍鐩綍
/// </summary>
@@ -174,7 +178,7 @@
Directory.CreateDirectory(path);
}
}
- catch (Exception ex)
+ catch
{
}
--
Gitblit v1.9.1