全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -38,15 +38,19 @@
            //设置头部信息

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



            var btnIcon = new MostRightIconControl(69, 69);

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

            topFrameLayout.AddChidren(btnIcon);

            btnIcon.InitControl();

            btnIcon.ButtonClickEvent += ((sender, e) =>

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

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

            {

                var form = new AddNewRoomForm();

                form.AddForm(i_floor);

            });

                var btnIcon = new MostRightIconControl(69, 69);

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

                topFrameLayout.AddChidren(btnIcon);

                btnIcon.InitControl();

                btnIcon.ButtonClickEvent += ((sender, e) =>

                {

                    var form = new AddNewRoomForm();

                    form.AddForm(i_floor);

                });

            }



            //初始化中部信息

            this.InitMiddleFrame();