请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs

@@ -53,7 +53,7 @@
            btnArea.X = Application.GetRealWidth(46);

            btnArea.TextSize = 12;

            btnArea.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnArea.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);

            btnArea.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);

            this.AddChidren(btnArea);

            //状态

            var btnStatu = new NormalViewControl(200, 49, true);