Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

陈嘉乐

2021-03-16 e1ac4ab0e68024e6289e0b11756962d662749b04

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

@@ -61,69 +61,6 @@
            }
            LoadDiv();

            //switch (function.spk)
            //{
            //    case SPK.CurtainSwitch:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
            //        break;
            //    case SPK.CurtainTrietex:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
            //        break;
            //    case SPK.CurtainRoller:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
            //        break;
            //    case SPK.SensorPir:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorPirIcon.png";
            //        break;
            //    case SPK.SensorWater:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorWaterImmersionIcon.png";
            //        break;
            //    case SPK.SensorSmoke:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeIcon.png";
            //        break;
            //    case SPK.SensorDoorWindow:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorDoorIcon.png";
            //        break;
            //    case SPK.MusicStandard:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
            //        break;
            //    case SPK.ClothesHanger:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerGrayIcon.png";
            //        break;
            //    case SPK.ElectricSocket:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
            //        break;
            //    case SPK.ElectricFan:
            //    case SPK.ElectricTuyaFan:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
            //        break;
            //    case SPK.ElectricTV:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
            //        break;
            //    case SPK.ElectricTuyaAirCleaner:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/AirCleanerThiinIcon.png";
            //        break;
            //    case SPK.ElectricTuyaWeepRobot:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png";
            //        break;
            //    case SPK.ElectricTuyaWaterValve:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png";
            //        break;
            //    case SPK.AcStandard:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
            //        break;
            //    case SPK.AcIr:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
            //        break;
            //    case SPK.FloorHeatStandard:
            //        btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
            //        break;
            //    default:
            //        btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
            //        break;
            //}
            btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";

            if (function.Spk_Prefix == FunctionCategory.Curtain//窗帘没有开关按钮
                || function.Spk_Prefix == FunctionCategory.Music//音乐没有开关按钮
                || function.Spk_Prefix == FunctionCategory.Sensor//传感器没有开关按钮
@@ -132,10 +69,39 @@
                switch (function.Spk_Prefix)
                {
                    case FunctionCategory.Curtain:
                      
                        switch (function.spk)
                        {
                            case SPK.CurtainSwitch:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
                                break;
                            case SPK.CurtainTrietex:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
                                break;
                            case SPK.CurtainRoller:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
                                break;
                        }
                        CurtainFragment();
                        break;
                    case FunctionCategory.Sensor:
                        switch (function.spk)
                        {
                            case SPK.SensorPir:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorPirIcon.png";
                                break;
                            case SPK.SensorWater:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorWaterImmersionIcon.png";
                                break;
                            case SPK.SensorSmoke:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeIcon.png";
                                break;
                            case SPK.SensorDoorWindow:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorDoorIcon.png";
                                break;
                            default:

                                break;
                        }
                        var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
                        if (powerLowTipAttr != null)
                        {
@@ -156,6 +122,7 @@

                        break;
                    case FunctionCategory.Music:
                        btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
                        MusicFragment();
                        break;

@@ -165,6 +132,7 @@
            {
                if (function.spk == SPK.ClothesHanger)//晾衣架
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerGrayIcon.png";
                    ClothesHangerFragment();
                }
                else
@@ -213,20 +181,51 @@
                    switch (function.Spk_Prefix)
                    {
                        case FunctionCategory.AC:
                            LoadLastStatesButton();
                            break;
                        case FunctionCategory.IR:
                            LoadLastStatesButton();
                            switch (function.spk)
                            {
                                case SPK.AcStandard:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
                                    LoadLastStatesButton();
                                    break;
                            }
                            break;
                        case FunctionCategory.FloorHeat:
                            LoadLastStatesButton();
                            switch (function.spk)
                            {
                                case SPK.FloorHeatStandard:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
                                    LoadLastStatesButton();
                                    break;
                            }
                            break;
                        case FunctionCategory.Light:
                            //btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
                            btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
                            btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
                            LoadLightControl();
                            break;
                        case FunctionCategory.Electric:
                            switch (function.spk)
                            {
                                case SPK.ElectricSocket:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
                                    break;
                                case SPK.ElectricFan:
                                case SPK.ElectricTuyaFan:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
                                    break;
                                case SPK.ElectricTV:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
                                    break;
                                case SPK.ElectricTuyaAirCleaner:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/AirCleanerThiinIcon.png";
                                    break;
                                case SPK.ElectricTuyaWeepRobot:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png";
                                    break;
                                case SPK.ElectricTuyaWaterValve:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png";
                                    break;
                            }
                            btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
                            break;
                    }