20210111-删除功能类别，统一使用spk去设备功能

wei

2021-01-11 b271bcceb1c4e718377ca86b6213816abcf7482a

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

@@ -35,6 +35,10 @@
        /// </summary>
        Button btnBrightnessText;
        /// <summary>
        /// 渐变时间修改
        /// </summary>
        DiyImageSeekBar barFadeTime;
        /// <summary>
        /// 开关按钮
        /// </summary>
        Button btnSwitch;
@@ -117,9 +121,14 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = light.collection
                IsSelected = light.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            dimmerBar = new WaveSeekBarOn()
            {
@@ -127,19 +136,14 @@
                Y = Application.GetRealHeight(74 + 16),
                Width = Application.GetRealWidth(168 - 40),
                Height = Application.GetRealHeight(288 - 16 - 16),
                //WaveBorderColor = CSS_Color.PromptingColor2,
                BorderColor = 0x00000000,
                CornerRadius = Application.GetRealWidth(40),
                CornerRadius = Application.GetRealWidth(30),
                BorderWidth = 0,
                //WavePadding = Application.GetRealWidth(-5),
                //BackgroundColor = CSS_Color.BackgroundColor,
                //Radius = (uint)Application.GetRealWidth(40),
                Progress = light.brightness,
                //ProgressTextColor =0x00000000,
                IsProgressTextShow = false,
            };
            controlView.AddChidren(dimmerBar);
            if(light.trait_on_off.value.ToString() == "on")
            if(light.trait_on_off.curValue.ToString() == "on")
            {
                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
            }
@@ -158,10 +162,8 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                Text = light.brightness + "%",
                BackgroundColor = 0xFF000FFF
            };
            controlView.AddChidren(btnBrightnessText);


            #region 渐变时间调节
            var btnGradualChangeText = new Button()
@@ -190,7 +192,7 @@
            };
            controlView.AddChidren(btnGradualChangeMinValuesText);

            var barGradualChange = new DiyImageSeekBar()
            barFadeTime = new DiyImageSeekBar()
            {
                X = btnGradualChangeMinValuesText.Right,
                Y = Application.GetRealHeight(412 - 21) + Application.GetRealHeight(8),
@@ -204,14 +206,14 @@
                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                ProgressBarUnitSring = "s",
                MaxValue = 10,
                Progress = 0,
                Progress = light.fadeTime,
                SeekBarPadding = Application.GetRealWidth(20),
            };
            controlView.AddChidren(barGradualChange);
            controlView.AddChidren(barFadeTime);

            var btnGradualChangeMaxValuesText = new Button()
            {
                X = barGradualChange.Right,
                X = barFadeTime.Right,
                Y = btnGradualChangeText.Bottom + Application.GetRealHeight(8),
                Width = Application.GetRealWidth(35),
                Height = Application.GetRealHeight(21),
@@ -231,15 +233,18 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = light.trait_on_off.value.ToString() == "on",
                //Tag = 
                IsSelected = light.trait_on_off.curValue.ToString() == "on",
            };
            controlView.AddChidren(btnSwitch);

            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView(light, actionRefresh);

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(light);
            })
            { IsBackground = true }.Start();
        }