20200811

wxr

2020-08-11 2bec9c838d2d688025698de8ec1de401ffd7dd1f

 HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPage.cs

@@ -213,7 +213,7 @@
                        switch (function.functionType)
                        {
                            case FunctionType.AC:
                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
                                break;
                            case FunctionType.FloorHeating:
                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
@@ -225,6 +225,31 @@
                        break;
                    case FunctionCategory.Light:
                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
                        break;
                    case FunctionCategory.SwitchDevice:
                        switch (function.functionType)
                        {
                            case FunctionType.Socket:
                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
                                break;
                        }
                        break;
                    case FunctionCategory.Electrical:
                        switch (function.functionType)
                        {
                            case FunctionType.Fan:
                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
                                break;
                            case FunctionType.TV:
                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
                                break;
                        }
                        break;
                    case FunctionCategory.Scene:
                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
                        break;
                    case FunctionCategory.Music:
                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
                        break;
                }

@@ -267,7 +292,6 @@
                        TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                    };
                    functionRow.AddChidren(btnFunctionFloorName);

                }

                Button btnChooseIcon = new Button()
@@ -276,8 +300,8 @@
                    X = Application.GetRealWidth(335),
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    SelectedImagePath = "Public/SelectionIcon.png",
                    UnSelectedImagePath = "Public/UnSelectionIcon.png",
                    UnSelectedImagePath = "Public/ChooseIcon.png",
                    SelectedImagePath = "Public/ChooseOnIcon.png",
                    IsSelected = function.roomIdList.Contains(room.sid)
                };
                functionRow.AddChidren(btnChooseIcon);
@@ -293,7 +317,6 @@
            {
                functionListView.Height = Application.GetRealHeight(518 - 40 - 62);
            }

        }

        /// <summary>