修改了 sokect

黄学彪

2020-07-09 5428935270159bfc42c2934ed7fb1091554fc9a4

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

@@ -24,14 +24,6 @@
        /// </summary>

        private VerticalFrameControl listBackContr = null;

        /// <summary>

        /// 楼层顺序

        /// </summary>

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

        /// <summary>

        /// 房间顺序

        /// </summary>

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

        /// <summary>

        /// 当前APP的住宅模式 0:还没有设置有模式 1:楼层模式 2:没有楼层模式

        /// </summary>

        private int AppResidenceMode = 0;

@@ -282,23 +274,17 @@
        {

            //获取楼层

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            this.listFloorSort.Clear();

            foreach (string keys in dicFloor.Keys)

            {

                listFloorSort.Add(keys);

            }



            if (Common.Config.Instance.Home.FloorDics.Count == 0)

            if (dicFloor.Count == 0)

            {

                return;

            }

            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                int count = listFloorSort.Count - 1;

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

                int count = dicFloor.Count;

                foreach (var keys in dicFloor.Keys)

                {

                    string keys = listFloorSort[i];

                    this.AddFloorRow(keys, dicFloor[keys], i != count);

                    count--;

                    this.AddFloorRow(keys, dicFloor[keys], count != 0);

                }

                //调整控件高度

                this.AdjustContrlTableHeight();

@@ -392,9 +378,6 @@
                            HdlRoomLogic.Current.RemoveRoom(roomId);

                        }

                        Common.Config.Instance.Home.Save();

                        //保存顺序

                        listFloorSort.Remove(keys);

                        HdlRoomLogic.Current.SaveFloorSort(listFloorSort);



                        if (Common.Config.Instance.Home.FloorDics.Count == 0)

                        {

@@ -540,12 +523,6 @@
        {

            //获取楼层的房间

            var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty);

            this.listRoomSort.Clear();

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

            {

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

            }



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

            {

                //添加房间行

@@ -593,7 +570,6 @@
                //如果是分享的房间，不能编辑和修改

                return;

            }



            //编辑

            var btnEditor = frameRow.AddEditorControl();

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

@@ -614,9 +590,6 @@
                this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>

                {

                    HdlRoomLogic.Current.RemoveRoom(room.Id);

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);

                    HdlRoomLogic.Current.SaveRoomSort(string.Empty, this.listRoomSort);



                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();

                    if (listAllRoom.Count <= 1)