Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

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

@@ -7,12 +7,23 @@
        /// <summary>
        /// 主控件View
        /// </summary>
        public FrameLayout frameLayout = new FrameLayout
        public FrameLayout frameLayout= new FrameLayout
        {
            Height = Application.GetRealHeight(44),
            Width = Application.GetRealWidth(343),
           BackgroundColor= CSS.CSS_Color.view,
            X = Application.GetRealWidth(LogicView.TextSize.left16),
        };

        /// <summary>
        /// 主控件View
        /// </summary>
        public RowLayout rowLayout = new RowLayout
        {
            Height = Application.GetRealHeight(43),
            Width = Application.GetRealWidth(343),
            LineColor = CSS.CSS_Color.viewTranslucence,
            SubViewWidth=Application.GetRealWidth(68),
        };
        /// <summary>
        /// （条件或者目标）图标
@@ -37,6 +48,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>
@@ -62,7 +88,16 @@
            BackgroundColor = CSS.CSS_Color.viewLine,

        };

        public Button btnDel = new Button
        {
            BackgroundColor = CSS.CSS_Color.textRedColor,
            TextID = StringId.Del,
            TextSize = LogicView.TextSize.text16,
            TextColor = CSS.CSS_Color.view,
            Gravity = Gravity.Center,
            TextAlignment = TextAlignment.Center,
        };
       
        public Button btnClick = new Button
        {
            Height = Application.GetRealHeight(44),
@@ -72,19 +107,24 @@
        /// View的方法
        /// </summary>
        /// <returns></returns>
        public FrameLayout FLayoutView()
        public void FLayoutView(VerticalScrolViewLayout verticalScrolView)
        {
            verticalScrolView.AddChidren(frameLayout);
            frameLayout.AddChidren(rowLayout);
            btnIcon.Gravity = Gravity.CenterVertical;
            btnText.Gravity = Gravity.CenterVertical;
            btnText.TextAlignment = TextAlignment.CenterLeft;
            btnNextIcon.Gravity = Gravity.CenterVertical;
            frameLayout.AddChidren(btnIcon);
            frameLayout.AddChidren(btnText);
            frameLayout.AddChidren(btnNextIcon);
            rowLayout.AddChidren(btnIcon);
            rowLayout.AddChidren(btnText);
            rowLayout.AddChidren(btnState);
            rowLayout.AddChidren(btnNextIcon);
            rowLayout.AddRightView(btnDel);
            rowLayout.AddChidren(btnClick);
            btnLine.Y = frameLayout.Height - 1;
            frameLayout.AddChidren(btnLine);
            frameLayout.AddChidren(btnClick);
            return frameLayout;

        }
      
    }
}