代码合并-温居城

wxr

2021-07-05 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae

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

@@ -61,67 +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//窗帘没有开关按钮
@@ -221,7 +160,6 @@
                            LoadLastStatesButton();
                            break;
                        case FunctionCategory.Light:
                            //btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
                            btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
                            LoadLightControl();
                            break;
@@ -289,7 +227,7 @@
            };
            //bodyDiv.AddChidren(btnCollectionIcon);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare && function.Spk_Prefix != FunctionCategory.Sensor)
            if ( function.Spk_Prefix != FunctionCategory.Sensor)//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
            {
                bodyDiv.AddChidren(btnCollectionIcon);
            }
@@ -370,10 +308,15 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0",
                IsSelected = function.GetAttrState(FunctionAttributeKey.OnOff) == "off",
                Tag = function.sid + "_off"
            };
            bodyDiv.AddChidren(btnCurtainClose);
            if(function.spk == SPK.CurtainRoller)
            {
                btnCurtainClose.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png";
                btnCurtainClose.SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png";
            }

            var btnCurtainStop = new Button()
            {
@@ -396,9 +339,14 @@
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
                Tag = function.sid + "_on",
                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0"
                IsSelected = function.GetAttrState(FunctionAttributeKey.OnOff) == "on",
            };
            bodyDiv.AddChidren(btnCurtainOpen);
            if (function.spk == SPK.CurtainRoller)
            {
                btnCurtainOpen.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png";
                btnCurtainOpen.SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png";
            }
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function);
            #endregion
        }
@@ -460,7 +408,7 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "MusicIcon/pause.png",
                SelectedImagePath = "MusicIcon/play.png",
                IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
                //IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
                Tag = function.spk + "_State_" + function.sid
            };
            bodyDiv.AddChidren(btnPlay);