合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -29,66 +29,51 @@
        {
            btnOption.MouseUpEventHandler = (sender, e) =>
            {
                if (btnOption.TextID == StringId.Save)
                Action action = () =>
                {
                    if (string.IsNullOrEmpty(room.roomName))
                    var waitPage = new Loading();
                    waitPage.Start();
                    new Thread(() =>
                    {
                        new Tip()
                        try
                        {
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);
                        return;
                    }
                    if (string.IsNullOrEmpty(room.floorName))
                    {
                        new Tip()
                        {
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.PlsBindFloor),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);
                        return;
                    }
                    foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
                    {
                        if (room.roomName == tempRoom.roomName)
                        {
                            new PublicAssmebly().TipMsg(StringId.Tip, StringId.AddingFailed_RoomAlreadyExists);
                            return;
                        }
                    }
                    var addResult = SpatialInfo.CurrentSpatial.AddRoom(room);
                    if (addResult == StateCode.SUCCESS)
                    {
                        backAction();
                        this.RemoveFromParent();
                    }
                }
                if (btnOption.TextID == StringId.DeleteRoom)
                {
                    Action action = () =>
                    {
                        var delResult = SpatialInfo.CurrentSpatial.DelRoom(room);
                        if (delResult == StateCode.SUCCESS)
                        {
                            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 FunctionList.List.GetDeviceFunctionList())
                                {
                                    f.roomIds.Remove(room.roomId);
                                    if (f.roomIds.Contains(room.roomId))
                                    {
                                        f.roomIds.Remove(room.roomId);
                                    }
                                }
                                Application.RunOnMainThread(() =>
                                {
                                    //删除事件回调
                                    this.deleteAction?.Invoke();
                                    this.RemoveFromParent();
                                });
                            }
                            //删除事件回调
                            this.deleteAction?.Invoke();
                            this.RemoveFromParent();
                        }
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);
                        catch (Exception ex)
                        {
                            MainPage.Log($"添加房间失败msg:{ex.Message}");
                        }
                        finally
                        {
                            Application.RunOnMainThread(() =>
                            {
                                waitPage.Hide();
                                waitPage.RemoveFromParent();
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                };
                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteRoomTip, action);
            };
        }


        /// <summary>
        /// 显示背景图选择选项
@@ -121,26 +106,16 @@
                }
                btnRoomName.Text = str;
                room.roomName = str;
                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();
                }
                room.UpdataRoomInfo();
            };
            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);
                }
                if (pageTitleId == StringId.AddRoom)
                {
                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
                }
                else
                {
                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
                }
                new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
            };
            btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
            roomNameRow.MouseUpEventHandler = eventHandler;
@@ -157,6 +132,7 @@
                Action floorsCallBackAction = () =>
                {
                    btnFloorInfo.Text = room.floorName;
                    room.UpdataRoomInfo();
                };
                var residentialManagePage = new RoomBinglingFloorPage(floorsCallBackAction, room);
                MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -275,13 +251,13 @@
            //房间默认图库
            btnDefaultGallery.MouseUpEventHandler = (sender, e) => {
                pictureOptionView.Parent.RemoveFromParent();
                Action<string> action = (obj) => {
                Action<string> action = (obj) =>
                {
                    room.backgroundImage = obj;
                    btnRoomBg.ImageBytes = null;//解决有ImageBytes不加载ImagePath
                    btnRoomBg.ImagePath = room.backgroundImage;
                    if (pageTitleId == StringId.EditRoomInfo)
                    {
                        room.SaveRoomData();
                    }
                    room.UpdataRoomInfo();
                    modifyImageAction?.Invoke();
                };

                var galleryPage = new RoomGalleryPage(room.backgroundImage, action);
@@ -308,12 +284,8 @@
            {
                //2020-12-03 需要讲最新的图片路径同步到云端
                room.backgroundImage = imageUrl;
                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();


                }
                room.UpdataRoomInfo();
                modifyImageAction?.Invoke();
            };
            //上传图片到云端
            UploadImage(selectImagePath, btnRoomBg, room, uploadSuccessAction);
@@ -365,7 +337,7 @@
                                    System.IO.File.Delete(imageView.ImagePath);
                                }
                                //重命名保存
                                FileUtils.WriteFileByBytes(imageUrl, imageBytes);
                                ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
                                imageView.ImagePath = null;
                                imageView.ImageBytes = imageBytes;
                                //上传成功