Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-21 5f46903845cf9b2cb4d7f186370d3eb7fb6c9577

 HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs

@@ -328,7 +328,7 @@
        /// 显示条件或者目标类型图标
        /// </summary>
        /// <param name="layouFrame">父控件</param>
        /// <param name="logic">当前逻辑</param>
        /// <param name="logic">当前自动化</param>
        private static void GetSelectIcon(FrameLayout layouFrame, Logic logic)
        {

@@ -341,6 +341,13 @@
            //2-功能图标
            for (int i = 0; i < logic.input.Count; i++)
            {
                if (logic.input[i] == null || logic.input[i].ToString() == "")
                {
                    //防止有的空对象；
                    //正常情况下不会该现象；
                    continue;
                }

                var int1 = int.Parse(logic.input[i].condition_type);
                int iconInt = 0;
                switch (int1)