From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 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 65bb8a2..f38003b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -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)
@@ -385,6 +388,12 @@
}
break;
+ case 10:
+ {
+ iconInt = 4;
+
+ }
+ break;
}
if (!iconIntValue.Contains(iconInt))
@@ -400,6 +409,7 @@
//12-20(琛ㄧず鐩爣鍥炬爣)鑷繁灞�閮ㄥ畾涔変负浜嗘樉绀洪�変腑鐩爣绫诲瀷鍥炬爣
//12-鍔熻兘鍥炬爣
//13-鍦烘櫙鍥炬爣
+ //14-瀹夐槻鍥炬爣
//14-寤舵椂鍥炬爣
for (int i = 0; i < logic.output.Count; i++)
{
@@ -422,6 +432,12 @@
case 3:
{
iconInt = 14;
+
+ }
+ break;
+ case 4:
+ {
+ iconInt = 15;
}
break;
@@ -482,6 +498,12 @@
strIcon = "LogicIcon/shiwaitianqi.png";
}
break;
+ case 4:
+ {
+
+ strIcon = "LogicIcon/selectTheScene.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
@@ -501,7 +523,14 @@
break;
case 14:
{
+
+ strIcon = "LogicIcon/security.png";
+ }
+ break;
+ case 15:
+ {
//strIcon = "LogicIcon/timeicon.png";
+
}
break;
@@ -510,9 +539,9 @@
}
}
/// <summary>
- /// 鍒ゆ柇缃戝叧绫诲瀷
+ /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧)
/// </summary>
- /// <returns></returns>
+ /// <returns>true=A鍗忚缃戝叧;false=bus缃戝叧</returns>
public static bool IsGatewayType
{
get
@@ -521,11 +550,7 @@
{
return true;
}
- else
- {
- return false;
-
- }
+ return false;
}
}
}
@@ -551,8 +576,10 @@
/// 閫昏緫浣胯兘锛堝紑锛屽叧锛�
/// </summary>
public string enable = "";
- //public CycleA cycle;
- //public string modifyTime = "";
+ /// <summary>
+ /// 鍦扮悊鍥存爮閰嶇疆
+ /// </summary>
+ public Fence geo_fence = new Fence();
}
class CycleA
--
Gitblit v1.8.0