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 | 13 +++++--------
1 files changed, 5 insertions(+), 8 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..372f4bb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -359,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)
@@ -510,9 +511,9 @@
}
}
/// <summary>
- /// 鍒ゆ柇缃戝叧绫诲瀷
+ /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧)
/// </summary>
- /// <returns></returns>
+ /// <returns>true=A鍗忚缃戝叧;false=bus缃戝叧</returns>
public static bool IsGatewayType
{
get
@@ -521,11 +522,7 @@
{
return true;
}
- else
- {
- return false;
-
- }
+ return false;
}
}
}
--
Gitblit v1.8.0