2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -20,10 +20,6 @@
        /// </summary>

        private string floorKeys = string.Empty;

        /// <summary>

        /// 全部的顺序

        /// </summary>

        private Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();

        /// <summary>

        /// 房间顺序

        /// </summary>

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

@@ -42,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();

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

            //图标

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

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

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

            //名称

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

            btnName.TextSize = 15;

@@ -127,7 +127,8 @@
            }

            frameRow.frameTable.ButtonClickEvent += (sender, e) =>

            {



                var form = new LookRoomSettionForm();

                form.AddForm(room);

            };



            if (room.IsSharedRoom == true)

@@ -169,6 +170,12 @@
                        Common.Room.CurrentRoom = Common.Room.Lists[0];

                    }

                    Common.Room.CurrentRoom.Remove(room.FileName);

                    //调整高度

                    frameRow.RemoveFromParent();

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

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);

                    Common.Room.CurrentRoom.SaveRoomSort(floorKeys, this.listRoomSort);

                });

            };

        }