Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs

@@ -145,8 +145,7 @@
            btnRoomName.Text = device.GetRoomListName();

            btnRoomName.Width = btnRoomName.GetRealWidthByText();

            FrameWhiteCentet1.AddChidren(btnRoomName);

            //成员没有收藏功能

            //if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false && ShowColltionButton)

            if (ShowColltionButton)

            {

                var btnCollection = new IconViewControl(40);

                btnCollection.X = Application.GetRealWidth(273);