请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs

@@ -90,7 +90,7 @@
            this.AddTopView(eName, 850);



            //房间

            string roomName = Common.Room.CurrentRoom.GetRoomNameByDevice(device);

            string roomName = HdlRoomLogic.Current.GetRoomNameByDevice(device);

            this.AddBottomView(roomName, 850);



            btnSelect = this.AddMostRightEmptyIcon(58, 58);