From 60d1e4fe729277415d46d1dde07efa051cb4e748 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 14 五月 2021 16:41:58 +0800
Subject: [PATCH] 2021-5-14-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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..65bb8a2 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);
}
@@ -372,6 +374,14 @@
case 3:
{
iconInt = 2;
+
+ }
+ break;
+ case 4:
+ case 6:
+ case 9:
+ {
+ iconInt = 3;
}
break;
@@ -466,6 +476,12 @@
strIcon = "LogicIcon/selectTheFun.png";
}
break;
+ case 3:
+ {
+
+ strIcon = "LogicIcon/shiwaitianqi.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
@@ -504,7 +520,6 @@
if (Entity.DB_ResidenceData.Instance.GatewayType == 1)
{
return true;
-
}
else
{
--
Gitblit v1.8.0