From 8e858cb477a4040d1f0a328c51db12b77313bed7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 21 四月 2021 16:10:18 +0800
Subject: [PATCH] 2021-4-21-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 7b8bdcd..3e24635 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -287,37 +287,38 @@
if (if_logic == null)
{
- Logic newlogic = new Logic();
- newlogic.name = logic.name;
- newlogic.userLogicId = logic.userLogicId;
- newlogic.sid = logic.sid;
- newlogic.relation = logic.relation;
- newlogic.enable = logic.enable;
- newlogic.cycle = logic.cycle;
- for (int i = 0; i < logic.input.Count; i++)
- {
- if (logic.input[i] == null || string.IsNullOrEmpty(logic.input[i].condition_type))
- {
- //闃叉璋冭瘯杞欢涔变紶涓滆タ涓婃潵;
- //闃叉鏈夌┖瀵硅薄锛�
- //姝ｅ父鎯呭喌涓嬩笉浼氬嚭鐜扮殑鐜拌薄锛�
- continue;
- }
- newlogic.input.Add(logic.input[i]);
- }
- for (int i = 0; i < logic.output.Count; i++)
- {
- if (logic.output[i] == null || string.IsNullOrEmpty(logic.output[i].target_type))
- {
- //闃叉璋冭瘯杞欢涔变紶涓滆タ涓婃潵;
- //闃叉鏈夌┖瀵硅薄锛�
- //姝ｅ父鎯呭喌涓嬩笉浼氳鐜拌薄锛�
- continue;
- }
- newlogic.output.Add(logic.output[i]);
- }
+ //Logic newlogic = new Logic();
+ //newlogic.name = logic.name;
+ //newlogic.userLogicId = logic.userLogicId;
+ //newlogic.sid = logic.sid;
+ //newlogic.relation = logic.relation;
+ //newlogic.enable = logic.enable;
+ //newlogic.cycle = logic.cycle;
+ //for (int i = 0; i < logic.input.Count; i++)
+ //{
+ // if (logic.input[i] == null || string.IsNullOrEmpty(logic.input[i].condition_type))
+ // {
+ // //闃叉璋冭瘯杞欢涔变紶涓滆タ涓婃潵;
+ // //闃叉鏈夌┖瀵硅薄锛�
+ // //姝ｅ父鎯呭喌涓嬩笉浼氬嚭鐜扮殑鐜拌薄锛�
+ // continue;
+ // }
+ // newlogic.input.Add(logic.input[i]);
+ //}
+ //for (int i = 0; i < logic.output.Count; i++)
+ //{
+ // if (logic.output[i] == null || string.IsNullOrEmpty(logic.output[i].target_type))
+ // {
+ // //闃叉璋冭瘯杞欢涔变紶涓滆タ涓婃潵;
+ // //闃叉鏈夌┖瀵硅薄锛�
+ // //姝ｅ父鎯呭喌涓嬩笉浼氳鐜拌薄锛�
+ // continue;
+ // }
+ // newlogic.output.Add(logic.output[i]);
+ //}
+
//娣诲姞閫昏緫
- Logic.LogicList.Add(newlogic);
+ Logic.LogicList.Add(logic);
}
}
@@ -504,7 +505,6 @@
if (Entity.DB_ResidenceData.Instance.GatewayType == 1)
{
return true;
-
}
else
{
--
Gitblit v1.8.0