2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

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

@@ -189,7 +189,7 @@
                //没有设置过模式

                if (AppResidenceMode == 0)

                {

                    var frame = new TopRightMenuControl(2);

                    var frame = new TopRightMenuControl(2, 2);

                    //创建楼层

                    frame.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uCreatFloor), "Item/CreatFloor.png", "Item/CreatFloorSelected.png", () =>

                    {

@@ -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)

            {

@@ -353,32 +353,40 @@
                    {

                        //移除楼层

                        Common.Config.Instance.Home.FloorDics.Remove(keys);

                        if (Common.Room.CurrentRoom == null)

                        if (Common.Config.Instance.Home.CurrentFloorId == keys)

                        {

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

                        }

                        var listDeleteFile = new List<string>();

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

                            //如果删除的是当前楼层的话

                            Common.Config.Instance.Home.CurrentFloorId = string.Empty;

                            foreach (string floorId in Common.Config.Instance.Home.FloorDics.Keys)

                        {

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

                            {

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

                                //把第一个楼层ID给它

                                Common.Config.Instance.Home.CurrentFloorId = floorId;

                                break;

                            }

                        }

                        //删除房间

                        foreach (string fileName in listDeleteFile)

                        var listDeleteId = new List<string>();

                        var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();

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

                        {

                            Common.Room.CurrentRoom.Remove(fileName);

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

                            {

                                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 roomId in listDeleteId)

                        {

                            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)

                        {

@@ -414,8 +422,15 @@
            }

            //请输入楼层名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputFloorName));

            if (Common.Config.Instance.Home.FloorDics.ContainsKey(keys) == true)

            {

                dialogForm.Text = Common.Config.Instance.Home.FloorDics[keys];

                floorName = Common.Config.Instance.Home.FloorDics[keys];

            }

            else

            {

            dialogForm.Text = floorName;



            }

            //按下确认按钮

            dialogForm.ComfirmClickEvent += ((textValue) =>

            {

@@ -487,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++)

            {

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

@@ -601,10 +617,10 @@
            Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();



            bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);

            //关闭进度条

            this.CloseProgressBar();

            if (result == false)

            {

                //关闭进度条

                this.CloseProgressBar();

                return;

            }



@@ -636,9 +652,10 @@
            Common.Config.Instance.HomeId = myHouse.Id;

            Common.Global.CreateHomeDirectory(myHouse.Id);

            Common.Config.Instance.Save();



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

            await UserCenterLogic.InitUserCenterMenmoryAndThread();

            Common.Room.InitAllRoom();

            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);

            HdlRoomLogic.Current.InitAllRoom();



            //删除住宅

            Common.House.DeleteHouseByHouseId(deleteId);

@@ -684,6 +701,12 @@
            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();

            foreach (var gateway in listGateway)

            {

                ZigBee.Device.ZbGateway realWay = null;

                if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)

                {

                    //错误:网关对象丢失

                    continue;

                }

                var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude);

                if (result == false)

                {

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

                return 1;

            }

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

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

            {

                //无楼层模式

                return 2;