Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -4,11 +4,17 @@
{
    public class AreaView
    {
        /// <summary>
        /// 主控件
        /// </summary>
        public FrameLayout frameLayout = new FrameLayout
        {
            Width = Application.GetRealWidth(144),
            Height = Application.GetRealHeight(44),
        };
        /// <summary>
        /// 房间名
        /// </summary>
        public Button btnRoomName = new Button
        {
            Width = Application.GetRealWidth(100),
@@ -20,6 +26,9 @@
            TextColor = CSS.CSS_Color.textColor,

        };
        /// <summary>
        /// 线
        /// </summary>
        public Button btnLine = new Button
        {
            Width = Application.GetRealWidth(112),