Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wxr

2021-09-01 2614964c9c3e0c8740e208d4d0606fa8a518b9c4

 HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs

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

                    {

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

                        btnFloorName.Width = btnFloorName.GetTextWidth();

                        //btnFloorName.Width = btnFloorName.GetTextWidth();

                        return;

                    }

                }

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

                    {

                        btnFloorName.Text = floorInfo.roomName;

                        btnFloorName.Width = btnFloorName.GetTextWidth();

                        //btnFloorName.Width = btnFloorName.GetTextWidth();

                    }

                }

            }