合并新代码

xm

2020-04-15 bff8993501334c4f3c5f902216fe03253be747f8

 ZigbeeApp20200414/Shared/Phone/Device/CommonForm/RoomView.cs

@@ -79,8 +79,8 @@
            var frameBackGroudTemp = new FrameLayout();
            frameBackGroudTemp.Width = roomBackView.Width;
            frameBackGroudTemp.Height = roomBackView.Height;
            frameBackGroudTemp.Radius = roomBackView.Radius;
            frameBackGroudTemp.BackgroundColor = 0x12000000;
            frameBackGroudTemp.Radius = (uint)Application.GetRealHeight(17);
            frameBackGroudTemp.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
            roomBackView.AddChidren(frameBackGroudTemp);

            roomNameBackground = new FrameLayout