Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

 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;
            }
        }
    }