Merge remote-tracking branch 'origin/WJC'

wxr

2020-12-01 a46cd0adb5af29e8a9cf47c219475acaedfcf839

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs

@@ -37,6 +37,21 @@
            //Y=Application.GetRealHeight(12),
            X = Application.GetRealWidth(52),
        };

        /// <summary>
        /// （条件或者目标）设备状态文本描述
        /// </summary>
        public Button btnState = new Button
        {
            TextSize = TextSize.text12,
            Width = Application.GetRealWidth(130),
            Height = Application.GetRealHeight(17),
            TextColor = CSS.CSS_Color.textCancelColor,
            Y=Application.GetRealHeight(14),
            X = Application.GetRealWidth(165),
            TextAlignment=TextAlignment.CenterRight,
        };

        /// <summary>
        /// （条件或者目标）图标
        /// </summary>
@@ -80,6 +95,7 @@
            btnNextIcon.Gravity = Gravity.CenterVertical;
            frameLayout.AddChidren(btnIcon);
            frameLayout.AddChidren(btnText);
            frameLayout.AddChidren(btnState);
            frameLayout.AddChidren(btnNextIcon);
            btnLine.Y = frameLayout.Height - 1;
            frameLayout.AddChidren(btnLine);