Merge branch 'WJC'

wxr

2020-12-08 145b157ba183ebf877c93ed2dbb01ec737c993d3

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

@@ -61,8 +61,8 @@
        /// </summary>
        public Button btn_subtract = new Button
        {
            Width = Application.GetMinRealAverage(24),
            Height = Application.GetMinRealAverage(24),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealWidth(24),
            X = Application.GetRealWidth(26),
            Y = Application.GetRealHeight(118),
            UnSelectedImagePath = "LogicIcon/-.png",
@@ -82,7 +82,7 @@
        {
            Y = Application.GetRealHeight(103),//进度条父控件Y坐标
            X = Application.GetRealWidth(62-10),//进度条X坐标
            SeekBarPadding=Application.GetRealHeight(10),//进度条实际长度=244-12*2(内边距);
            SeekBarPadding=Application.GetRealHeight(10),//进度条实际长度=244-10*2(内边距);
            Width = Application.GetRealWidth(240),//进度条的长度
            Height = Application.GetRealHeight(54),//进度条父控件高度
            IsProgressTextShow = true,//显示百分比
@@ -99,8 +99,8 @@
        /// </summary>
        public Button btn_add = new Button
        {
            Width = Application.GetMinRealAverage(24),
            Height = Application.GetMinRealAverage(24),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealWidth(24),
            X = Application.GetRealWidth(294),
            Y = Application.GetRealHeight(118),
            UnSelectedImagePath = "LogicIcon/+.png",
@@ -131,14 +131,12 @@
            frameLayout.AddChidren(seekBarVol);
            frameLayout.AddChidren(btn_add);
            frameLayout.AddChidren(btn_add_click);

            ////界面点击事件
            fLayout.MouseUpEventHandler += (sender, e1) =>
            //取消点击事件
            btnCancel.MouseUpEventHandler += (sender, e1) =>
            {
                //移除fLayout界面
                fLayout.RemoveFromParent();
            };
            //取消点击事件

        }
    }