From 39cf2411b59772d56ee731f229f09ff472889bad Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 九月 2022 15:12:04 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into hxb
---
HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
index 0e7d6c0..5c4ec9f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
@@ -181,13 +181,13 @@
public void AddDic(string keyValue, string comparator,string value,string data_type)
{
Input input = new Input();
- input.sid = LogicMethod.CurrLogicMethod.NewSid();
+ input.sid = LogicMethod.Current.NewSid();
input.condition_type = "6";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", keyValue);
- LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", comparator);
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", data_type);
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
+ LogicMethod.Current.dictionary(dic, "key", keyValue);
+ LogicMethod.Current.dictionary(dic, "comparator", comparator);
+ LogicMethod.Current.dictionary(dic, "data_type", data_type);
+ LogicMethod.Current.dictionary(dic, "value", value);
input.condition.Add(dic);
AddCondition(input, keyValue, comparator);
}
@@ -227,7 +227,7 @@
Logic.currlogic.input.Add(input);
}
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0