Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

@@ -93,7 +93,7 @@
        {
            var floors = new SelectFloor();
            AddChidren(floors);
            floors.Init(599, 161);
            floors.Init(599, 161,Direction.Right);
            floors.FloorAction += (floorName) =>
            {
                floorBtn.Text = floorName;