From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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..372f4bb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -142,6 +142,7 @@
}
else
{
+
var onePortAutomation = new OnePortAutomation();
MainPage.BasePageView.AddChidren(onePortAutomation);
onePortAutomation.Show();
@@ -278,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)
{
@@ -316,6 +316,8 @@
}
newlogic.output.Add(logic.output[i]);
}
+ newlogic.noticeConfig = logic.noticeConfig;
+ newlogic.pushConfigs = logic.pushConfigs;
//娣诲姞閫昏緫
Logic.LogicList.Add(newlogic);
}
@@ -357,7 +359,8 @@
//2-鍔熻兘鍥炬爣
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)
@@ -372,6 +375,14 @@
case 3:
{
iconInt = 2;
+
+ }
+ break;
+ case 4:
+ case 6:
+ case 9:
+ {
+ iconInt = 3;
}
break;
@@ -466,6 +477,12 @@
strIcon = "LogicIcon/selectTheFun.png";
}
break;
+ case 3:
+ {
+
+ strIcon = "LogicIcon/shiwaitianqi.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
@@ -494,9 +511,9 @@
}
}
/// <summary>
- /// 鍒ゆ柇缃戝叧绫诲瀷
+ /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧)
/// </summary>
- /// <returns></returns>
+ /// <returns>true=A鍗忚缃戝叧;false=bus缃戝叧</returns>
public static bool IsGatewayType
{
get
@@ -504,13 +521,8 @@
if (Entity.DB_ResidenceData.Instance.GatewayType == 1)
{
return true;
-
}
- else
- {
- return false;
-
- }
+ return false;
}
}
}
--
Gitblit v1.8.0