Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

wei

2020-12-11 4f40e8385ff6725be8e8b642e50f9f7201a27dfa

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

@@ -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.uid))
                            foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
                            {
                                f.roomIds.Remove(room.uid);
                                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);
                };
@@ -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);
                                Common.FileUtlis.Files.WriteFileByBytes(imageUrl, imageBytes);
                                imageView.ImagePath = null;
                                imageView.ImageBytes = imageBytes;
                                //上传成功