From 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:23:35 +0800
Subject: [PATCH] 代码合并-温居城
---
HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
index 34870f5..f1da613 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
@@ -99,16 +99,16 @@
/// <param name="value"></param>
private void AddDic(string value)
{
- Input inputTime = new Input();
- inputTime.sid = LogicMethod.NewSid();
- inputTime.condition_type = "6";
+ Input input = new Input();
+ input.sid = LogicMethod.CurrLogicMethod.NewSid();
+ input.condition_type = "6";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", "weather");
- LogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.dictionary(dic, "value", value);
- inputTime.condition.Add(dic);
- AddCondition(inputTime);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "key", "weather");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
+ input.condition.Add(dic);
+ AddCondition(input);
}
/// <summary>
/// 娣诲姞鏉′欢
@@ -140,7 +140,7 @@
Logic.currlogic.input.Add(input);
}
- LogicMethod.RemoveAllView();
+ LogicMethod.CurrLogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0