Merge branch 'WJC' into wxr7

wxr

2021-08-21 264f86c363a6a019fac8eb138877fee9e4734e2d

 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;