From a56a485926a8927f904d7f4795c371c25b35753a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 18:18:15 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 167b476..2497cbb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -43,7 +43,7 @@
LogicView.SingleLogicView logicView = new LogicView.SingleLogicView();
vv.AddChidren(logicView.FLayoutView());
logicView.btnLogicName.Text = currLogic.name;
- logicView.btnWeekText.Text = GetWeekText(currLogic);
+ logicView.btnWeekText.Text = GetCyclicText(currLogic);
logicView.btnclick.MouseUpEventHandler += (sen, e) =>
{
Logic.currlogic = currLogic;
@@ -135,7 +135,7 @@
///杩斿洖寰幆鎻忚堪鏂囨湰
/// </summary>
/// <param name="logic"></param>
- public static string GetWeekText(Logic logic)
+ public static string GetCyclicText(Logic logic)
{
string weekName = "";
@@ -168,7 +168,7 @@
return weekName;
}
/// <summary>
- /// 鑾峰彇鏄熸湡鐨勫瓧绗︿覆
+ /// 杩斿洖鏄熸湡鎻忚堪鏂囨湰
/// </summary>
/// <param name="weekList"></param>
/// <returns></returns>
@@ -231,9 +231,8 @@
/// <summary>
/// 鑾峰彇閫昏緫鍒楄〃
/// </summary>
- private static void GetLogicList()
+ public static void GetLogicList()
{
-
if (Logic.LogicList.Count != 0)
{
//鑷姩鍖栧垪琛ㄤ负0鎵嶅幓鑾峰彇鑷姩鍖栧垪琛紱
@@ -312,6 +311,12 @@
//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;
@@ -348,6 +353,12 @@
//14-寤舵椂鍥炬爣
for (int i = 0; i < logic.output.Count; i++)
{
+ if (logic.output[i] == null)
+ {
+ //闃叉鏈夌殑绌哄璞★紱
+ //姝ｅ父鎯呭喌涓嬩笉浼氳鐜拌薄锛�
+ continue;
+ }
var int1 = int.Parse(logic.output[i].target_type);
int iconInt = 0;
switch (int1)
--
Gitblit v1.8.0