Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 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



@@ -81,11 +77,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);

@@ -156,9 +147,6 @@
                    //调整高度

                    frameRow.RemoveFromParent();

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

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);

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

                });

            };

        }