Merge remote-tracking branch 'origin/newBranch1' into WJC

xm

2021-11-24 1802b849f0dadc81644fb0a706d6fb45efdf2a20

 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();

                    }

                }

            }