From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 119 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 9113330..e933b09 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);
}
}
@@ -357,9 +357,12 @@
//1-10(琛ㄧず鏉′欢鍥炬爣)鑷繁灞�閮ㄥ畾涔変负浜嗘樉绀洪�変腑鏉′欢绫诲瀷鍥炬爣
//1-鏃堕棿鍥炬爣
//2-鍔熻兘鍥炬爣
+ //3-浜戠鍥炬爣
+ //4-鍦烘櫙鍥炬爣
for (int i = 0; i < logic.input.Count; i++)
{
-
+ if (logic.input[i] == null)
+ continue;
var int1 = int.Parse(logic.input[i].condition_type);
int iconInt = 0;
switch (int1)
@@ -374,6 +377,20 @@
case 3:
{
iconInt = 2;
+
+ }
+ break;
+ case 4:
+ case 6:
+ case 9:
+ {
+ iconInt = 3;
+
+ }
+ break;
+ case 10:
+ {
+ iconInt = 4;
}
break;
@@ -392,6 +409,7 @@
//12-20(琛ㄧず鐩爣鍥炬爣)鑷繁灞�閮ㄥ畾涔変负浜嗘樉绀洪�変腑鐩爣绫诲瀷鍥炬爣
//12-鍔熻兘鍥炬爣
//13-鍦烘櫙鍥炬爣
+ //14-瀹夐槻鍥炬爣
//14-寤舵椂鍥炬爣
for (int i = 0; i < logic.output.Count; i++)
{
@@ -414,6 +432,12 @@
case 3:
{
iconInt = 14;
+
+ }
+ break;
+ case 4:
+ {
+ iconInt = 15;
}
break;
@@ -468,6 +492,18 @@
strIcon = "LogicIcon/selectTheFun.png";
}
break;
+ case 3:
+ {
+
+ strIcon = "LogicIcon/shiwaitianqi.png";
+ }
+ break;
+ case 4:
+ {
+
+ strIcon = "LogicIcon/selectTheScene.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
@@ -487,7 +523,14 @@
break;
case 14:
{
+
+ strIcon = "LogicIcon/security.png";
+ }
+ break;
+ case 15:
+ {
//strIcon = "LogicIcon/timeicon.png";
+
}
break;
@@ -496,9 +539,9 @@
}
}
/// <summary>
- /// 鍒ゆ柇缃戝叧绫诲瀷
+ /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧)
/// </summary>
- /// <returns></returns>
+ /// <returns>true=A鍗忚缃戝叧;false=bus缃戝叧</returns>
public static bool IsGatewayType
{
get
@@ -507,11 +550,7 @@
{
return true;
}
- else
- {
- return false;
-
- }
+ return false;
}
}
}
--
Gitblit v1.8.0