Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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;