From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
HMI.Core/Setting/SystemSetting.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/HMI.Core/Setting/SystemSetting.cs b/HMI.Core/Setting/SystemSetting.cs
index b2fe7be..5378e82 100644
--- a/HMI.Core/Setting/SystemSetting.cs
+++ b/HMI.Core/Setting/SystemSetting.cs
@@ -13,6 +13,8 @@
/// </summary>
public static event EventHandler<SystemSetting> SystemSettingChanged;
+ private static string FilePath = Path.Combine(PathHelper.SettingFolder, "SystemConfig.xml");
+
static SystemSetting()
{
LoadFromXml();
@@ -27,18 +29,18 @@
public string WindowTitle { get; private set; }
public string PlcIp { get; private set; }
public bool PlcEnabled { get; private set; }
+ public string CurrentLanguage { get; private set; }
private static void LoadFromXml()
{
if (Instance != null) return;
- string XmlFilePath = PathHelper.ConfigFolder + "\\SystemConfig.xml";
- if (!File.Exists(XmlFilePath))
+ if (!File.Exists(FilePath))
{
Instance = new SystemSetting();
}
else
{
- SystemSettingModel model = XmlHelper.DeserializeFromXml<SystemSettingModel>(XmlFilePath);
+ SystemSettingModel model = XmlHelper.DeserializeFromXml<SystemSettingModel>(FilePath);
SystemSetting setting = new SystemSetting();
BeanUtil.Copy(model, setting);
Instance = setting;
@@ -47,14 +49,13 @@
public static void ReLoad()
{
- string XmlFilePath = PathHelper.ConfigFolder + "\\SystemConfig.xml";
- if (!File.Exists(XmlFilePath))
+ if (!File.Exists(FilePath))
{
- Instance = new SystemSetting();
+ return;
}
else
{
- SystemSettingModel model = XmlHelper.DeserializeFromXml<SystemSettingModel>(XmlFilePath);
+ SystemSettingModel model = XmlHelper.DeserializeFromXml<SystemSettingModel>(FilePath);
SystemSetting setting = new SystemSetting();
BeanUtil.Copy(model, setting);
Instance = setting;
@@ -93,5 +94,12 @@
get => plcEnabled;
set { Set(ref plcEnabled, value); }
}
+
+ private string currentLanguage;
+ public string CurrentLanguage
+ {
+ get => currentLanguage;
+ set { Set(ref currentLanguage, value); }
+ }
}
}
--
Gitblit v1.9.1