合并温居城代码

wxr

2021-07-01 b409ece9569247d7e7b44fc15e8a02556ca05a57

 HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs

@@ -241,6 +241,7 @@
            {

                //全部

                btnFloorName.Text = Language.StringByID(StringId.All);

                btnFloorName.Width = btnFloorName.GetTextWidth();

            }

            //房间

            else if (selectType == 3)

@@ -250,6 +251,7 @@
                    if (roomInfo.uid == this.nowShowSelectId)

                    {

                        btnFloorName.Text = roomInfo.floorName + roomInfo.roomName;

                        btnFloorName.Width = btnFloorName.GetTextWidth();

                        return;

                    }

                }

@@ -262,6 +264,7 @@
                    if (floorInfo.uid == this.nowShowSelectId)

                    {

                        btnFloorName.Text = floorInfo.roomName;

                        btnFloorName.Width = btnFloorName.GetTextWidth();

                    }

                }

            }