2020-12-01 1.请求路径修改。 2.切换住宅或者查询住宅列表增加获取网关列表。 3.房间增加默认图片选择、比例调整为16：9。4.优化图片裁剪。

JLChen

2020-12-01 5efaaab958a0f4a91ad9d76b5d5fea0ea3fc3f41

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

@@ -39,7 +39,7 @@
                        }.Show(bodyView);
                        return;
                    }
                    if(string.IsNullOrEmpty( room.floorName))
                    if (string.IsNullOrEmpty(room.floorName))
                    {
                        new Tip()
                        {
@@ -222,9 +222,11 @@
            {
                baseView.RemoveFromParent();
            };
            btnTakePicture.MouseDownEventHandler = (sender, e) => {
            btnTakePicture.MouseDownEventHandler = (sender, e) =>
            {
                btnTakePicture.IsSelected = true;
            };
            //拍照
            btnTakePicture.MouseUpEventHandler = (sender, e) =>
            {
                btnTakePicture.IsSelected = false;
@@ -239,19 +241,19 @@
                //    }
                //}, pid.ToString(), 16, 9);

                var imageName = Guid.NewGuid().ToString() + ".png";
                //var imageName = Guid.NewGuid().ToString();
                var imageName = room.sid;
                CropImage.TakePicture((imagePath) =>
                {
                    CropImageCallBack(imagePath, imageName);
                }, imageName.ToString(), 17, 9);

                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();
                }
                }, imageName, 16, 9);

                baseView.RemoveFromParent();
            };
            btnAlbum.MouseDownEventHandler = (sender, e) => {
            //选择照片
            btnAlbum.MouseDownEventHandler = (sender, e) =>
            {
                btnAlbum.IsSelected = true;
            };

@@ -270,45 +272,83 @@
                //}, pid.ToString(), 16, 9);

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

                }, imageName, 16, 9);

                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();
                }
                baseView.RemoveFromParent();

            };

            //房间默认图库
            btnDefaultGallery.MouseUpEventHandler = (sender, e) => {
                pictureOptionView.Parent.RemoveFromParent();
                Action<string> action = (obj) => {
                    room.backgroundImage = obj;
                    btnRoomBg.ImagePath = room.backgroundImage;
                    if (pageTitleId == StringId.EditRoomInfo)
                    {
                        room.SaveRoomData();
                    }
                };

                var galleryPage = new RoomGalleryPage(room.backgroundImage, action);
                MainPage.BasePageView.AddChidren(galleryPage);
                galleryPage.LoadPage(true);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            };
        }

        /// <summary>
        /// 
        /// 裁剪完照片回调，统一处理
        /// </summary>
        /// <param name="imagePath"></param>
        /// <param name="imageName"></param>
        /// <param name="imagePath">裁剪后的真实路径</param>
        /// <param name="imageName">自定义的图片名称</param>
        void CropImageCallBack(string imagePath, string imageName)
        {
            if (string.IsNullOrEmpty(imagePath) == true)
            {
                return;
            }
            //如果是自定义图片删除之前的
            try
            {
                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);
            }

            MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
            //1.3如果是安卓需要拷贝回来APP根目录
            FileUtils.FileCopyToRootPath(imagePath, imageName);
            System.IO.File.Delete(imagePath);
            //生成图片
            room.backgroundImage = imageName;
            btnRoomBg.ImagePath = imageName;
            mPath = imageName;
#endif
                //清空原来图片
                btnRoomBg.ImagePath = "NULL";
                //生成图片
                room.backgroundImage = mPath;
                btnRoomBg.ImagePath = mPath;

                if (pageTitleId == StringId.EditRoomInfo)
                {
                    room.SaveRoomData();
                }
            }
            catch { }
        }
    }
}