Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs

@@ -110,7 +110,7 @@
            listView.AddChidren(frameRow);

            //图标

            var btnIcon = frameRow.frameTable.AddLeftIcon(81);

            btnIcon.UnSelectedImagePath = "Item/RoomIconSelected.png";

            btnIcon.UnSelectedImagePath = "Item/RoomIcon.png";

            //名称

            var btnName = frameRow.frameTable.AddLeftCaption(room.Name, 600);

            btnName.TextSize = 15;