合并了代码

黄学彪

2019-10-28 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9

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

@@ -114,7 +110,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 +123,8 @@
            }

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

            {



                var form = new LookRoomSettionForm();

                form.AddForm(room);

            };



            if (room.IsSharedRoom == true)

@@ -169,6 +166,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);

                });

            };

        }