2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs

@@ -29,7 +29,7 @@
        /// <summary>
        /// 调光控件
        /// </summary>
        WaveSeekBar dimmerBar;
        WaveSeekBarOn dimmerBar;
        /// <summary>
        /// 开关按钮
        /// </summary>
@@ -41,6 +41,7 @@
        Button btnCollection_Out;
        Button btnFunctionName_Out;
        Button btnFromFloor_Out;
        bool onDimmerBar = false;
        /// <summary>
        /// 刷新显示信息
        /// </summary>
@@ -116,23 +117,31 @@
            };
            controlView.AddChidren(btnCollection);

            dimmerBar = new WaveSeekBar()
            dimmerBar = new WaveSeekBarOn()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(74 + 16),
                Width = Application.GetRealWidth(168 - 40),
                Height = Application.GetRealHeight(288 - 16 - 16),
                WaveColor = light.on_off == 1 ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
                WaveBorderColor = CSS_Color.PromptingColor2,
                //WaveBorderColor = CSS_Color.PromptingColor2,
                BorderColor = 0x00000000,
                CornerRadius = Application.GetRealWidth(1),
                CornerRadius = Application.GetRealWidth(40),
                BorderWidth = 0,
                WavePadding = Application.GetRealWidth(-5),
                BackgroundColor = CSS_Color.BackgroundColor,
                Radius = (uint)Application.GetRealWidth(40),
                //WavePadding = Application.GetRealWidth(-5),
                //BackgroundColor = CSS_Color.BackgroundColor,
                //Radius = (uint)Application.GetRealWidth(40),
                Progress = light.brightness,
            };
            controlView.AddChidren(dimmerBar);
            if(light.trait_on_off.value.ToString() == "on")
            {
                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
            }
            else
            {
                dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
            }
            

            #region 渐变时间调节
            var btnGradualChangeText = new Button()
@@ -201,7 +210,7 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = light.on_off != 0,
                IsSelected = light.trait_on_off.value.ToString() == "on",
                //Tag = 
            };
            controlView.AddChidren(btnSwitch);