删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

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

@@ -266,7 +266,7 @@
        private void InitFloorRow()

        {

            //获取楼层

            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            this.listFloorSort.Clear();

            foreach (string keys in dicFloor.Keys)

            {

@@ -364,33 +364,29 @@
                                break;

                            }

                        }

                        
                        if (Common.Room.CurrentRoom == null)

                        var listDeleteId = new List<string>();

                        var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();

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

                        {

                            Common.Room.CurrentRoom = Common.Room.Lists[0];

                        }

                        var listDeleteFile = new List<string>();

                        for (int i = 0; i < Common.Room.Lists.Count; i++)

                        {

                            if (Common.Room.Lists[i].FloorId == keys)

                            if (listAllRoom[i].FloorId == keys)

                            {

                                listDeleteFile.Add(Common.Room.Lists[i].FileName);

                                listDeleteId.Add(listAllRoom[i].Id);

                            }

                        }

                        //如果当前选择的房间是删除对象的话

                        if (Common.Room.CurrentRoom.FloorId == keys)

                        if (HdlRoomLogic.Current.CurrentRoom.FloorId == keys)

                        {

                            Common.Room.CurrentRoom = Common.Room.Lists[0];

                            HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();

                        }

                        //删除房间

                        foreach (string fileName in listDeleteFile)

                        foreach (string roomId in listDeleteId)

                        {

                            Common.Room.CurrentRoom.Remove(fileName);

                            HdlRoomLogic.Current.RemoveRoom(roomId);

                        }

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

                        //保存顺序

                        listFloorSort.Remove(keys);

                        Common.Room.CurrentRoom.SaveFloorSort(listFloorSort);

                        HdlRoomLogic.Current.SaveFloorSort(listFloorSort);



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

                        {

@@ -506,7 +502,7 @@
        private void InitRoomListRow()

        {

            //获取楼层的房间

            var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(string.Empty);

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

            this.listRoomSort.Clear();

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

            {

@@ -579,17 +575,18 @@
                //确认删除房间?

                this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>

                {

                    if (Common.Room.CurrentRoom.Id == room.Id)

                    if (HdlRoomLogic.Current.CurrentRoom.Id == room.Id)

                    {

                        //如果删除的是当前房间的话

                        Common.Room.CurrentRoom = Common.Room.Lists[0];

                        HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();

                    }

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

                    HdlRoomLogic.Current.RemoveRoom(room.Id);

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);

                    Common.Room.CurrentRoom.SaveRoomSort(string.Empty, this.listRoomSort);

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



                    if (Common.Room.Lists.Count <= 1)

                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();

                    if (listAllRoom.Count <= 1)

                    {

                        //根据指定模式,初始化桌布控件

                        this.InitFrameTableByMode();

@@ -658,7 +655,7 @@


            //刷新个人中心的内存及线程

            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);

            Common.Room.InitAllRoom();

            HdlRoomLogic.Current.InitAllRoom();



            //删除住宅

            Common.House.DeleteHouseByHouseId(deleteId);

@@ -746,7 +743,7 @@
                //拥有楼层

                return 1;

            }

            if (Common.Room.Lists.Count > 1)

            if (HdlRoomLogic.Current.GetAllListRooms().Count > 1)

            {

                //无楼层模式

                return 2;