合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -19,10 +19,6 @@
        /// 楼层的主键

        /// </summary>

        private string floorKeys = string.Empty;

        /// <summary>

        /// 房间顺序

        /// </summary>

        private List<string> listRoomSort = new List<string>();



        #endregion



@@ -41,15 +37,19 @@
            //主人或者管理员才会出现这个菜单

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

            {

                var btnIcon = new MostRightIconControl(69, 69);

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

                topFrameLayout.AddChidren(btnIcon);

                btnIcon.InitControl();

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

                //查看模板时,不允许编辑

                if (Common.Config.Instance.Home.IsShowTemplate == false)

                {

                    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);

                    });

                }

            }



            //初始化中部信息

@@ -81,11 +81,6 @@
        {

            //获取楼层的房间

            var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);

            this.listRoomSort.Clear();

            for (int i = 0; i < listRoom.Count; i++)

            {

                this.listRoomSort.Add(listRoom[i].Id);

            }



            this.listView.RemoveAll();

            listView.Height = bodyFrameLayout.Height + Application.GetRealHeight(6);

@@ -144,6 +139,12 @@
                var form = new EditorRoomInforForm();

                form.AddForm(room);

            };

            //查看模板时,不允许编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

            {

                btnEditor.Text = Language.StringByID(R.MyInternationalizationString.uSearch1);

                return;

            }



            //删除

            var btnDelete = frameRow.AddDeleteControl();

@@ -156,9 +157,12 @@
                    //调整高度

                    frameRow.RemoveFromParent();

                    listView.AdjustRealHeight(Application.GetRealHeight(23));

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);

                    HdlRoomLogic.Current.SaveRoomSort(floorKeys, this.listRoomSort);



                    if (room.ListDevice.Count > 0)

                    {

                        //上传空间区域信息

                        HdlRoomLogic.Current.SetRoomInfoToGateway();

                    }

                });

            };

        }