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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

@@ -384,11 +384,6 @@
                                listDeleteId.Add(listAllRoom[i].Id);

                            }

                        }

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

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

                        {

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

                        }

                        //删除房间

                        foreach (string roomId in listDeleteId)

                        {

@@ -616,11 +611,6 @@
                //确认删除房间?

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

                {

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

                    {

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

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

                    }

                    HdlRoomLogic.Current.RemoveRoom(room.Id);

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);