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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -38,6 +38,9 @@
            //设置头部信息

            base.SetTitleText(Common.Config.Instance.Home.FloorDics[i_floor]);



            //主人或者管理员才会出现这个菜单

            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)

            {

            var btnIcon = new MostRightIconControl(69, 69);

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

            topFrameLayout.AddChidren(btnIcon);

@@ -47,6 +50,7 @@
                var form = new AddNewRoomForm();

                form.AddForm(i_floor);

            });

            }



            //初始化中部信息

            this.InitMiddleFrame();