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

wei

2021-01-11 b271bcceb1c4e718377ca86b6213816abcf7482a

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

@@ -11,21 +11,20 @@
        /// </summary>
        public static void UpdataStates(Light uFunction)
        {
            Application.RunOnMainThread(() =>
            Application.RunOnMainThread((Action)(() =>
            {
                try
                {
                    if (bodyView == null)
                        return;
                    if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
                    if (uFunction.spk == bodyView.light.spk && uFunction.sid == bodyView.light.sid)
                    {
                        

                        if (uFunction.trait_on_off.curValue.ToString() == "on")
                        {
                            bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
                            bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                            bodyView.btnSwitch.IsSelected = true;
                            bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                            if (!bodyView.onDimmerBar)
                            {
                                bodyView.dimmerBar.Progress = uFunction.brightness;
@@ -40,13 +39,22 @@
                            //色盘的圆点隐藏
                            bodyView.btnWhiteRound.Visible = false;
                        }
                        bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                        if (bodyView.light.GetRGBcolor() == 16777215 && bodyView.btnCurColor.BorderColor != 0x00000000)
                        {
                            bodyView.btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2;
                        }
                        else
                        {
                            bodyView.btnCurColor.BorderColor = 0x00000000;
                        }
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                }
            });
            }));
        }


@@ -198,7 +206,7 @@
            barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
            {
                light.fadeTime = barFadeTime.Progress;
                light.SaveFunctionData(true);
                light.UpdataFuncitonInfo();
            };
        }
        /// <summary>
@@ -246,10 +254,12 @@
                {
                    return;
                }
                btnWhiteRound.Visible = true;
                btnWhiteRound.Gravity = Gravity.Center;

                light.SetRGBcolor(new byte[] { 255, 255, 255 });
                btnCurColor.BackgroundColor = 0xFFFFFFFF;
                btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
                Control.Ins.SendWriteCommand(light, d);