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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -189,7 +189,7 @@
                //没有设置过模式

                if (AppResidenceMode == 0)

                {

                    var frame = new TopRightMenuControl(2);

                    var frame = new TopRightMenuControl(2, 2);

                    //创建楼层

                    frame.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uCreatFloor), "Item/CreatFloor.png", "Item/CreatFloorSelected.png", () =>

                    {