代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs

@@ -64,6 +64,8 @@
                Gravity = Gravity.CenterVertical,
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextSize=14,
                IsBold=true
            };

            var selectFloorBtn = new Button()
@@ -183,8 +185,7 @@
        private void ShowUnallocatedRoom_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
        {
            var unalloctedRoom = new UnallocatedRoom();
            HomePage.Instance.AddChidren(unalloctedRoom);
            HomePage.Instance.PageIndex += 1;
            AddChidren(unalloctedRoom);
            unalloctedRoom.Show();
        }
    }