From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.Common.Model/Helper/SettingHelper.cs | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/SettingHelper.cs b/src/Bro.Common.Model/Helper/SettingHelper.cs
index f481646..a14100e 100644
--- a/src/Bro.Common.Model/Helper/SettingHelper.cs
+++ b/src/Bro.Common.Model/Helper/SettingHelper.cs
@@ -17,27 +17,41 @@
const string PROPERTY_ICONPATH = "IconPath";
static string ConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, SETTINGFILE);
- static JObject data = null;
- static JObject Data
+ //static JObject data = null;
+ //static JObject Data
+ //{
+ // get
+ // {
+ // if (File.Exists(ConfigPath))
+ // {
+ // using (StreamReader reader = new StreamReader(ConfigPath, System.Text.Encoding.UTF8))
+ // {
+ // string dataStr = reader.ReadToEnd();
+ // data = JsonConvert.DeserializeObject<JObject>(dataStr);
+ // }
+ // }
+ // return data;
+ // }
+ //}
+
+ public static JObject GetSettingData()
{
- get
+ JObject settingData = null;
+ if (File.Exists(ConfigPath))
{
- if (File.Exists(ConfigPath))
+ using (StreamReader reader = new StreamReader(ConfigPath, System.Text.Encoding.UTF8))
{
- using (StreamReader reader = new StreamReader(ConfigPath, System.Text.Encoding.UTF8))
- {
- string dataStr = reader.ReadToEnd();
- data = JsonConvert.DeserializeObject<JObject>(dataStr);
- }
+ string dataStr = reader.ReadToEnd();
+ settingData = JsonConvert.DeserializeObject<JObject>(dataStr);
}
- return data;
}
+ return settingData;
}
public static List<string> GetProductionCodes()
{
List<string> codes = new List<string>();
-
+ var Data = GetSettingData();
if (Data != null && Data.ContainsKey(PROPERTY_PRODUCTIONCODES))
{
codes = Data.Value<JArray>(PROPERTY_PRODUCTIONCODES).ToList().ConvertAll(u => u.ToString());
@@ -54,7 +68,7 @@
public static List<string> GetProcessCodes()
{
List<string> codes = new List<string>();
-
+ var Data = GetSettingData();
if (Data != null && Data.ContainsKey(PROPERTY_PROCESSCODES))
{
codes = Data.Value<JArray>(PROPERTY_PROCESSCODES).ToList().ConvertAll(u => u.ToString());
@@ -64,14 +78,14 @@
public static List<string> AddNewProductionCode(string code)
{
- List<string> codes = GetProductionCodes();
- if (!codes.Contains(code))
- {
- codes.Add(code);
- }
- var dataTemp = Data;
+ var dataTemp = GetSettingData();
if (dataTemp != null && dataTemp.ContainsKey(PROPERTY_PRODUCTIONCODES))
{
+ List<string> codes = GetProductionCodes();
+ if (!codes.Contains(code))
+ {
+ codes.Add(code);
+ }
dataTemp[PROPERTY_PRODUCTIONCODES] = new JArray(codes);
string newDataStr = JsonConvert.SerializeObject(dataTemp, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto });
@@ -88,7 +102,7 @@
public static string GetConfigFilePath()
{
string path = "";
-
+ var Data = GetSettingData();
if (Data != null && Data.ContainsKey(PROPERTY_CONFIGPATH))
{
path = Data.Value<string>(PROPERTY_CONFIGPATH);
@@ -100,7 +114,7 @@
public static string GetProgramDescription()
{
string desc = "浼偗妫嚜鍔ㄥ寲鎶�鏈湁闄愬叕鍙�";
-
+ var Data = GetSettingData();
if (Data != null && Data.ContainsKey(PROPERTY_DESCRIPTION))
{
desc = Data.Value<string>(PROPERTY_DESCRIPTION);
@@ -117,7 +131,7 @@
{
iconPath = "";
}
-
+ var Data = GetSettingData();
if (Data != null && Data.ContainsKey(PROPERTY_ICONPATH))
{
iconPath = Data.Value<string>(PROPERTY_ICONPATH);
--
Gitblit v1.8.0