请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -114,7 +114,7 @@
            frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);

            if (tempDevice != null)

            {

                btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(tempDevice);

                btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);

            }

            else

            {

@@ -140,7 +140,7 @@
                return;

            }

            btnDevie.Text = Common.LocalDevice.Current.GetDeviceEpointName(tempDevice);

            btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(tempDevice);

            btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);



            string unSelectPath = string.Empty;

            string selectPath = string.Empty;