Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

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

@@ -2,6 +2,8 @@
using Shared;
using HDL_ON.Entity;
using System.Collections.Generic;
using HDL_ON.DAL.Server;
using System.Threading;

namespace HDL_ON.UI
{
@@ -29,7 +31,7 @@
            {
                if (btnOption.TextID == StringId.Save)
                {
                    if (string.IsNullOrEmpty(room.name))
                    if (string.IsNullOrEmpty(room.roomName))
                    {
                        new Tip()
                        {
@@ -49,15 +51,15 @@
                        }.Show(bodyView);
                        return;
                    }
                    foreach (var tempRoom in DB_ResidenceData.rooms)
                    foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
                    {
                        if (room.name == tempRoom.name)
                        if (room.roomName == tempRoom.roomName)
                        {
                            new PublicAssmebly().TipMsg(StringId.Tip, StringId.AddingFailed_RoomAlreadyExists);
                            return;
                        }
                    }
                    DB_ResidenceData.rooms.Add(room);
                    SpatialInfo.CurrentSpatial.AddRoom(room);
                    room.SaveRoomData();
                    backAction();
                    this.RemoveFromParent();
@@ -68,13 +70,16 @@
                    {
                        foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
                        {
                            if (f.roomIds.Contains(room.sid))
                            if (f.roomIds.Contains(room.uid))
                            {
                                f.roomIds.Remove(room.sid);
                                f.roomIds.Remove(room.uid);
                            }
                        }
                        DB_ResidenceData.DelRoom(room);
                        backAction();
                        SpatialInfo.CurrentSpatial.DelRoom(room);
                        // backAction();
                        // DB_ResidenceData.DelRoom(room);
                        //删除事件回调
                        this.deleteAction?.Invoke();
                        this.RemoveFromParent();
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);
@@ -112,7 +117,7 @@
                    return;
                }
                btnRoomName.Text = str;
                room.name = str;
                room.roomName = str;
                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();
@@ -121,17 +126,17 @@
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                List<string> roomNameList = new List<string>();
                foreach (var rroom in DB_ResidenceData.rooms)
                foreach (var rroom in DB_ResidenceData.residenceData.Rooms)
                {
                    roomNameList.Add(rroom.name);
                    roomNameList.Add(rroom.roomName);
                }
                if (pageTitleId == StringId.AddRoom)
                {
                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
                }
                else
                {
                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, 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;
@@ -230,22 +235,12 @@
            btnTakePicture.MouseUpEventHandler = (sender, e) =>
            {
                btnTakePicture.IsSelected = false;
                //var pid = Guid.NewGuid();
                //CropImage.TakePicture((imagePath) =>
                //{
                //    if (imagePath != null)
                //    {
                //        btnRoomBg.ImagePath = imagePath.ToString();
                //        room.backgroundImage = btnRoomBg.ImagePath;
                //        MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
                //    }
                //}, pid.ToString(), 16, 9);

                //var imageName = Guid.NewGuid().ToString();
                var imageName = room.sid;
               
                var imageName = Guid.NewGuid().ToString();
                //var imageName = room.sid;
                CropImage.TakePicture((imagePath) =>
                {
                    CropImageCallBack(imagePath, imageName);
                    CropImageCallBack(imagePath);

                }, imageName, 16, 9);

@@ -260,23 +255,13 @@
            btnAlbum.MouseUpEventHandler = (sender, e) =>
            {
                btnAlbum.IsSelected = false;
                //var pid = Guid.NewGuid();
                //CropImage.SelectPicture((imagePath) =>
                //{
                //    if (imagePath != null)
                //    {
                //        btnRoomBg.ImagePath = imagePath.ToString();
                //        room.backgroundImage = btnRoomBg.ImagePath;
                //        MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
                //    }
                //}, pid.ToString(), 16, 9);

                //从相册选择图片裁剪
                //var imageName = Guid.NewGuid().ToString();
                var imageName = room.sid;
                var imageName = Guid.NewGuid().ToString();
                //var imageName = room.sid;
                CropImage.SelectPicture((imagePath) =>
                {
                    CropImageCallBack(imagePath, imageName);
                    CropImageCallBack(imagePath);

                }, imageName, 16, 9);

@@ -309,46 +294,111 @@
        /// </summary>
        /// <param name="imagePath">裁剪后的真实路径</param>
        /// <param name="imageName">自定义的图片名称</param>
        void CropImageCallBack(string imagePath, string imageName)
        void CropImageCallBack(string selectImagePath)
        {
            if (string.IsNullOrEmpty(imagePath) == true)
            if (string.IsNullOrEmpty(selectImagePath) == true)
            {
                return;
            }
            try
            //上传成功到回调
            Action<string> uploadSuccessAction = (imageUrl) =>
            {
                var mPath = imagePath;
                MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
#if __IOS__


#else
            //imageName = imageName + ".png";

            //1.使用新名字，解决相同路径不刷新图片问题
            imageName = Guid.NewGuid().ToString() + ".png";
            //1.2如果是自定义图片删除之前的
            if (!btnRoomBg.ImagePath.Contains("Room")) {
                Utlis.WriteLine("删除: " + btnRoomBg.ImagePath);
                System.IO.File.Delete(btnRoomBg.ImagePath);
            }
            //1.3如果是安卓需要拷贝回来APP根目录
            FileUtils.FileCopyToRootPath(imagePath, imageName);
            System.IO.File.Delete(imagePath);
            mPath = imageName;
#endif
                //清空原来图片
                btnRoomBg.ImagePath = "NULL";
                //生成图片
                room.backgroundImage = mPath;
                btnRoomBg.ImagePath = mPath;

                //2020-12-03 需要讲最新的图片路径同步到云端
                room.backgroundImage = imageUrl;
                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();

                }
            };
            //上传图片到云端
            UploadImage(selectImagePath, btnRoomBg, room, uploadSuccessAction);
        }

        /// <summary>
        /// 上传图片方法
        /// </summary>
        /// <param name="selectImagePath">裁剪后的图片路径</param>
        /// <param name="imageView"></param>
        /// <param name="uploadSuccessAction"></param>
        void UploadImage(string selectImagePath, ImageView imageView, Room mRoom, Action<string> uploadSuccessAction)
        {
            try
            {
                MainPage.Log("SelectPicture 裁剪图片返回
路径: " + selectImagePath);
                //1.读取裁剪后的图片，然后删除
                var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
                System.IO.File.Delete(selectImagePath);

                var waitPage = new Loading();
                bodyView.AddChidren(waitPage);
                waitPage.Start(Language.StringByID(StringId.PleaseWait));
                //开始上传
                new Thread(() =>
                {
                    try
                    {
                        var newImageName = mRoom.roomName.Trim() +  ".png";
                        var uploadImageObj = new UploadImageObj()
                        {
                            prefix = "ONR",
                            fileName = newImageName,
                            uid = mRoom.uid,
                            content = imageBytes,
                        };

                        var imageUrl = ImageUtlis.Current.UploadImage(uploadImageObj);
                        if (!string.IsNullOrEmpty(imageUrl) && imageUrl.Contains(newImageName))
                        {
                            //上传成功
                            Application.RunOnMainThread(() =>
                            {
                                Utlis.WriteLine("上传成功：" + imageUrl);
                                //1.2如果是自定义图片删除之前的
                                if (!imageView.ImagePath.Contains("Classification/Room/Roombg"))
                                {
                                    Utlis.WriteLine("删除: " + imageView.ImagePath);
                                    System.IO.File.Delete(imageView.ImagePath);
                                }
                                //重命名保存
                                FileUtils.WriteFileByBytes(imageUrl, imageBytes);
                                imageView.ImagePath = null;
                                imageView.ImageBytes = imageBytes;
                                //上传成功
                                Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully));
                                uploadSuccessAction?.Invoke(imageUrl);
                            });
                        }
                        else
                        {
                            //上传失败
                            Application.RunOnMainThread(() =>
                            {
                                //上传失败
                                Utlis.ShowTip(Language.StringByID(StringId.UploadFailed));
                            });
                        }

                    }
                    catch (Exception ex)
                    {
                    }
                    finally
                    {
                        Application.RunOnMainThread(() =>
                        {
                            if (waitPage != null)
                            {
                                waitPage.RemoveFromParent();
                                waitPage = null;
                            }
                        });
                    }
                })
                { IsBackground = true }.Start();
            }
            catch { }
        }

    }
}