上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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