2

wei

2021-03-09 d41f1d4a478c1afcc43f3a5abb0ba76e376bc7c1

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -172,12 +172,7 @@
                //搜索网关
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(() =>
                        {
                            //DriverLayer.Control.Ins.SearchLoaclGateway();
                            //MainPage.InitializationData();
                            //DriverLayer.Control.Ins.IsRemote = true;
                        });
                  
                };
#endif

@@ -330,14 +325,15 @@

                btnChangeFunction = new Button()
                {
                    Width = Application.GetRealWidth(114),
                    X = Application.GetRealWidth(10),
                    Width = Application.GetRealWidth(114-10),
                    TextID = StringId.Functions,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.HeadlineFontSize,
                    TextAlignment = TextAlignment.Center,
                    IsSelected = true,
                    IsBold = true
                    IsBold = true,
                };
                changeView.AddChidren(btnChangeFunction);

@@ -354,7 +350,7 @@
                btnChangeScene = new Button()
                {
                    X = btnLine.Right,
                    Width = Application.GetRealWidth(114),
                    Width = Application.GetRealWidth(114-10),
                    TextID = StringId.Scenes,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextColor = CSS_Color.PromptingColor1,
@@ -463,7 +459,6 @@
        /// </summary>
        void LoadDeviceFunctionControlZone()
        {
         
            #region ContextView
            deviceFunctionView.RemoveAll();
            functionViews.Clear();
@@ -474,7 +469,7 @@
                foreach (var function in FunctionList.List.GetDeviceFunctionList())
                {
                    //音乐模块有主从关系，需要特殊处理
                    if (function.functionCategory == FunctionCategory.Music)
                    if (function.Spk_Prefix == FunctionCategory.Music)
                    {
                        var music = function as Music.A31MusicModel;
                        if (music.ServerClientType == -1)
@@ -744,8 +739,8 @@
                }

                LoadEvent_FunctionCollection(btnCollection, function);

                if (function.functionCategory == FunctionCategory.Curtain)
                if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
                    function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
                    btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
@@ -773,10 +768,10 @@
                    };
                    view.AddChidren(btnCurtainOpen);

                    LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
                    LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
                }

                else if (function.functionType == FunctionType.TV)
                else if (function.spk == SPK.ElectricTV)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
                    Button btnPower;
@@ -789,10 +784,10 @@
                        UnSelectedImagePath = "Public/PowerClose.png",
                    };
                    view.AddChidren(btnPower);
                    LoadEvent_ControlTV(function as TV, btnPower);
                    LoadEvent_ControlTV(function, btnPower);
                }

                else if (function.functionCategory == FunctionCategory.Music)
                else if (function.spk == SPK.MusicStandard)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
                    btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
@@ -815,7 +810,8 @@

                    //Music.SendMethod.ReadStatus(a31player);

                    btnPower.MouseUpEventHandler = (sender, e) => {
                    btnPower.MouseUpEventHandler = (sender, e) =>
                    {
                        if (btnPower.IsSelected)
                        {
                            btnPower.IsSelected = false;
@@ -834,6 +830,39 @@
                    };
                }

                else if (function.spk == SPK.ClothesHanger)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerBlueIcon.png";
                    btnIcon.SelectedImagePath = "FunctionIcon/Electrical/Curtain/ClothesHangerBlueIcon.png";
                    Button btnUp;
                    btnUp = new Button()
                    {
                        X = Application.GetRealWidth(84+3),
                        Y = Application.GetRealWidth(89),
                        Width = Application.GetRealWidth(38),
                        Height = Application.GetRealWidth(38),
                        UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon2.png",
                        SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon2On.png",
                    };
                    view.AddChidren(btnUp);

                    Button btnDown;
                    btnDown = new Button()
                    {
                        X = btnUp.Right + Application.GetRealWidth(3),
                        Y = Application.GetRealWidth(89),
                        Width = Application.GetRealWidth(38),
                        Height = Application.GetRealWidth(38),
                        UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon2.png",
                        SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon2On.png",
                    };
                    view.AddChidren(btnDown);


                    LoadEvent_ControlClothesHanger(function, btnUp, btnDown);

                }

                else
                {
                    Button btnSwitch;
@@ -848,47 +877,54 @@
                    };
                    view.AddChidren(btnSwitch);

                    switch (function.functionCategory)
                    switch (function.Spk_Prefix)
                    {
                        //todo 增加设备，主页收藏图标
                        case FunctionCategory.Light:
                            #region 灯光 Light
                            btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
                            btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
                            UpdataFunctionStates(function as Light);
                            UpdataFunctionStates(function);
                            #endregion
                            break;
                        case FunctionCategory.Thermostat:
                            switch (function.functionType)
                            {
                                case FunctionType.AC:
                                    #region 空调 AC
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
                                    btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
                                    #endregion
                                    break;
                                case FunctionType.FloorHeating:
                                    #region 地热
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
                                    btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
                                    #endregion
                                    break;
                            }
                        case FunctionCategory.AC:
                            #region 空调 AC
                            btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
                            btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
                            #endregion
                            break;
                        case FunctionCategory.SwitchDevice:
                            switch (function.functionType)
                        case FunctionCategory.FloorHeat:
                            #region 地热
                            btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
                            btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
                            #endregion
                            break;
                        case FunctionCategory.Electric:
                            switch (function.spk)
                            {
                                case FunctionType.Socket:
                                case SPK.ElectricSocket:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
                                    btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
                                    break;
                            }
                            break;
                        case FunctionCategory.Electrical:
                            switch (function.functionType)
                            {
                                case FunctionType.Fan:
                                case SPK.ElectricFan:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
                                    btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
                                    break;
                                case SPK.ElectricTuyaAirCleaner:
                                    btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIcon.png";
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIconOn.png";
                                    break;
                                case SPK.ElectricTuyaFan:
                                    btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/FanIcon.png";
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/FanIconOn.png";
                                    break;
                                case SPK.ElectricTuyaWaterValve:
                                    btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIcon.png";
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIconOn.png";
                                    break;
                                case SPK.ElectricTuyaWeepRobot:
                                    btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIcon.png";
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIconOn.png";
                                    break;
                            }
                            break;
@@ -898,7 +934,7 @@
                //取消收藏事件
                Action cannelCollect = () => {
                    function.collect = false;
                    if (function.functionCategory == FunctionCategory.Music)//处理音乐主从关系
                    if (function.Spk_Prefix == FunctionCategory.Music)//处理音乐主从关系
                    {
                        if ((function as Music.A31MusicModel).ServerClientType == 1)
                        {
@@ -911,13 +947,14 @@
                    function.CollectFunction();
                };


                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
                view.MouseUpEventHandler = skipControlPageEvent;
                btnName.MouseUpEventHandler = skipControlPageEvent;
                btnIcon.MouseUpEventHandler = skipControlPageEvent;
                btnState.MouseUpEventHandler = skipControlPageEvent;
                //电视不需要更新状态
                if(function.functionType!= FunctionType.TV)
                if(function.spk!= SPK.ElectricTV)
                {
                    UpdataFunctionStates(function);
                }