Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

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