From 4d14154c36ac5692aadc036eed97fb9f1c410e2a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 23 五月 2021 14:46:03 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index a1d1ecd..5f789d2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -279,7 +279,6 @@
var jay = jArray[a];
//鏁版嵁杩斿簭鍒楀寲涓篖ogic瀵硅薄
var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- Console.WriteLine("鑾峰彇閫昏緫==="+str);
var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str);
if (logic != null)
{
@@ -288,38 +287,39 @@
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]);
+ }
+ newlogic.noticeConfig = logic.noticeConfig;
+ newlogic.pushConfigs = logic.pushConfigs;
//娣诲姞閫昏緫
- Logic.LogicList.Add(logic);
+ Logic.LogicList.Add(newlogic);
}
}
--
Gitblit v1.8.0