合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -353,6 +353,18 @@
                    {

                        //移除楼层

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

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

                        {

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

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

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

                            {

                                //把第一个楼层ID给它

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

                                break;

                            }

                        }

                        
                        if (Common.Room.CurrentRoom == null)

                        {

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