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 | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 5f789d2..e933b09 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -357,6 +357,8 @@
//1-10(琛ㄧず鏉′欢鍥炬爣)鑷繁灞�閮ㄥ畾涔変负浜嗘樉绀洪�変腑鏉′欢绫诲瀷鍥炬爣
//1-鏃堕棿鍥炬爣
//2-鍔熻兘鍥炬爣
+ //3-浜戠鍥炬爣
+ //4-鍦烘櫙鍥炬爣
for (int i = 0; i < logic.input.Count; i++)
{
if (logic.input[i] == null)
@@ -386,6 +388,12 @@
}
break;
+ case 10:
+ {
+ iconInt = 4;
+
+ }
+ break;
}
if (!iconIntValue.Contains(iconInt))
@@ -401,6 +409,7 @@
//12-20(琛ㄧず鐩爣鍥炬爣)鑷繁灞�閮ㄥ畾涔変负浜嗘樉绀洪�変腑鐩爣绫诲瀷鍥炬爣
//12-鍔熻兘鍥炬爣
//13-鍦烘櫙鍥炬爣
+ //14-瀹夐槻鍥炬爣
//14-寤舵椂鍥炬爣
for (int i = 0; i < logic.output.Count; i++)
{
@@ -423,6 +432,12 @@
case 3:
{
iconInt = 14;
+
+ }
+ break;
+ case 4:
+ {
+ iconInt = 15;
}
break;
@@ -483,6 +498,12 @@
strIcon = "LogicIcon/shiwaitianqi.png";
}
break;
+ case 4:
+ {
+
+ strIcon = "LogicIcon/selectTheScene.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
@@ -502,7 +523,14 @@
break;
case 14:
{
+
+ strIcon = "LogicIcon/security.png";
+ }
+ break;
+ case 15:
+ {
//strIcon = "LogicIcon/timeicon.png";
+
}
break;
@@ -511,9 +539,9 @@
}
}
/// <summary>
- /// 鍒ゆ柇缃戝叧绫诲瀷
+ /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧)
/// </summary>
- /// <returns></returns>
+ /// <returns>true=A鍗忚缃戝叧;false=bus缃戝叧</returns>
public static bool IsGatewayType
{
get
@@ -522,11 +550,7 @@
{
return true;
}
- else
- {
- return false;
-
- }
+ return false;
}
}
}
--
Gitblit v1.8.0