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

wei

2021-01-11 b271bcceb1c4e718377ca86b6213816abcf7482a

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

@@ -60,20 +60,20 @@
            }
            LoadDiv();

            if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Music || function.functionCategory == FunctionCategory.Scene)//窗帘没有开关按钮
            if (function.Spk_Prefix == FunctionCategory.Curtain || function.Spk_Prefix == FunctionCategory.Music)//窗帘没有开关按钮
            {
                switch (function.functionCategory)
                switch (function.Spk_Prefix)
                {
                    case FunctionCategory.Curtain:
                        switch(function.functionType)
                        switch (function.spk)
                        {
                            case FunctionType.Curtain:
                            case SPK.CurtainSwitch:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
                                break;
                            case FunctionType.MotorCurtain:
                            case SPK.CurtainTrietex:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
                                break;
                            case FunctionType.RollingShutter:
                            case SPK.CurtainRoller:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
                                break;
                        }
@@ -93,7 +93,7 @@
                /// 开关按钮
                /// </summary>
                Button btnSwitch;
                if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
                if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                {
                    btnSwitch = new Button()
                    {
@@ -107,6 +107,8 @@
                        Tag = function.sid + "_Switch",
                    };
                    bodyDiv.AddChidren(btnSwitch);
                    //加载开关按钮事件
                    LoadEvent_SwitchFunction(btnSwitch, function.attributes.Find((obj) => obj.key == FunctionAttributeKey.FadeTime));
                }
                else
                {
@@ -122,20 +124,25 @@
                        Tag = function.sid + "_Switch",
                    };
                    bodyDiv.AddChidren(btnSwitch);
                    //加载开关按钮事件
                    LoadEvent_SwitchFunction(btnSwitch);
                }
                //加载开关按钮事件
                LoadEvent_SwitchFunction(btnSwitch);

                switch (function.functionCategory)
                switch (function.Spk_Prefix)
                {
                    case FunctionCategory.Thermostat:
                        switch (function.functionType)
                    case FunctionCategory.AC:
                        switch (function.spk)
                        {
                            case FunctionType.AC:
                            case SPK.AcStandard:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
                                LoadLastStatesButton();
                                break;
                            case FunctionType.FloorHeating:
                        }
                        break;
                    case FunctionCategory.FloorHeat:
                        switch (function.spk)
                        {
                            case SPK.FloorHeatStandard:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
                                LoadLastStatesButton();
                                break;
@@ -146,22 +153,16 @@
                        btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
                        LoadLightControl();
                        break;
                    case FunctionCategory.SwitchDevice:
                        switch (function.functionType)
                    case FunctionCategory.Electric:
                        switch (function.spk)
                        {
                            case FunctionType.Socket:
                            case SPK.ElectricSocket:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
                                break;
                        }
                        btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
                        break;
                    case FunctionCategory.Electrical:
                        switch (function.functionType)
                        {
                            case FunctionType.Fan:
                            case SPK.ElectricFan:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
                                break;
                            case FunctionType.TV:
                            case SPK.ElectricTV:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
                                break;
                        }
@@ -171,10 +172,7 @@
                #endregion
            }

            if (function.functionCategory != FunctionCategory.Scene)
            {
                LoadEvent_DivSkipEvent();
            }
            LoadEvent_DivSkipEvent();
            LoadEvent_FunctionCollection();
        }

@@ -241,10 +239,10 @@
        /// </summary>
        void LoadLightControl()
        {
            switch (function.functionType)
            switch (function.spk)
            {
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case SPK.LightDimming:
                case SPK.LightRGB:
                    #region Dimmer
                    var btnDimmerMinValues = new Button()
                    {
@@ -311,7 +309,8 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
                Tag = function.functionType + "_off_" + function.sid
                IsSelected = function.trait_on_off.curValue.ToString() == "off",
                Tag = function.sid + "_off"
            };
            bodyDiv.AddChidren(btnCurtainClose);

@@ -323,6 +322,8 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
                Tag = function.sid + "_stop",
                IsSelected = function.trait_on_off.curValue.ToString() == "stop"
            };
            bodyDiv.AddChidren(btnCurtainStop);

@@ -334,7 +335,8 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
                Tag = function.functionType + "_on_" + function.sid
                Tag = function.sid + "_on",
                IsSelected = function.trait_on_off.curValue.ToString() == "on"
            };
            bodyDiv.AddChidren(btnCurtainOpen);
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);
@@ -367,7 +369,7 @@
                UnSelectedImagePath = "MusicIcon/pause.png",
                SelectedImagePath = "MusicIcon/play.png",
                IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
                Tag = function.functionType + "_State_" + function.sid
                Tag = function.spk + "_State_" + function.sid
            };
            bodyDiv.AddChidren(btnPlay);

@@ -391,6 +393,10 @@
        /// </summary>
        void LoadLastStatesButton()
        {
            if(function.spk == SPK.LightSwitch)
            {
                return;
            }
            var btnLastStates = new Button()
            {
                X = Application.GetRealWidth(10 + 32 + 8),
@@ -402,7 +408,7 @@
                SelectedTextColor = CSS_Color.PromptingColor1,
                TextColor = 0x00000000,
                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                Tag = function.functionType + "_laststates_" + function.sid,
                Tag = function.spk + "_laststates_" + function.sid,
                IsSelected = function.trait_on_off.curValue.ToString() == "on"
            };
            bodyDiv.AddChidren(btnLastStates);