2020-12-12 1.解锁逻辑优化

JLChen

2020-12-12 b3abfd30576871c32f2839a322fa3bb783f96498

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs

@@ -51,7 +51,7 @@
                        }.Show(bodyView);
                        return;
                    }
                    foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
                    foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
                    {
                        if (room.roomName == tempRoom.roomName)
                        {
@@ -59,28 +59,31 @@
                            return;
                        }
                    }
                    SpatialInfo.CurrentSpatial.AddRoom(room);
                    room.SaveRoomData();
                    backAction();
                    this.RemoveFromParent();
                    var addResult = SpatialInfo.CurrentSpatial.AddRoom(room);
                    if (addResult == StateCode.SUCCESS)
                    {
                        backAction();
                        this.RemoveFromParent();
                    }
                }
                if (btnOption.TextID == StringId.DeleteRoom)
                {
                    Action action = () =>
                    {
                        foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
                        var delResult = SpatialInfo.CurrentSpatial.DelRoom(room);
                        if (delResult == StateCode.SUCCESS)
                        {
                            if (f.roomIds.Contains(room.roomId))
                            foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
                            {
                                f.roomIds.Remove(room.roomId);
                                if (f.roomIds.Contains(room.roomId))
                                {
                                    f.roomIds.Remove(room.roomId);
                                }
                            }
                            //删除事件回调
                            this.deleteAction?.Invoke();
                            this.RemoveFromParent();
                        }
                        SpatialInfo.CurrentSpatial.DelRoom(room);
                        // backAction();
                        // DB_ResidenceData.DelRoom(room);
                        //删除事件回调
                        this.deleteAction?.Invoke();
                        this.RemoveFromParent();
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);
                };
@@ -126,7 +129,7 @@
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                List<string> roomNameList = new List<string>();
                foreach (var rroom in DB_ResidenceData.residenceData.Rooms)
                foreach (var rroom in SpatialInfo.CurrentSpatial.RoomList)
                {
                    roomNameList.Add(rroom.roomName);
                }
@@ -155,9 +158,9 @@
                {
                    btnFloorInfo.Text = room.floorName;
                };
                var residentialManagePage = new FloorsManagementPage(floorsCallBackAction);
                var residentialManagePage = new RoomBinglingFloorPage(floorsCallBackAction, room);
                MainPage.BasePageView.AddChidren(residentialManagePage);
                residentialManagePage.LoadPage(room, StringId.FloorAssignment);
                residentialManagePage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            btnFloorInfo.MouseUpEventHandler = eventHandler;
@@ -362,7 +365,7 @@
                                    System.IO.File.Delete(imageView.ImagePath);
                                }
                                //重命名保存
                                FileUtils.WriteFileByBytes(imageUrl, imageBytes);
                                ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
                                imageView.ImagePath = null;
                                imageView.ImageBytes = imageBytes;
                                //上传成功