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

JLChen

2020-12-01 5efaaab958a0f4a91ad9d76b5d5fea0ea3fc3f41

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -747,16 +747,17 @@
                //}, pid.ToString(), 4, 3);


                var imageName = Guid.NewGuid().ToString() + ".png";
                //var imageName = Guid.NewGuid().ToString();
                var imageName = scene.sid;
                CropImage.TakePicture((imagePath) =>
                {
                    CropImageCallBack(imagePath, imageName);
                }, imageName, 4, 3);

                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveFunctionData();
                }
                //if (pageTitleId == StringId.EditScene)
                //{
                //    scene.SaveFunctionData();
                //}
                pictureOptionView.Parent.RemoveFromParent();
            };
            btnAlbum.MouseDownEventHandler = (sender, e) => {
@@ -778,17 +779,18 @@
                //}, pid.ToString(), 4, 3);

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


                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveFunctionData();
                }
                //if (pageTitleId == StringId.EditScene)
                //{
                //    scene.SaveFunctionData();
                //}
                pictureOptionView.Parent.RemoveFromParent();
            };

@@ -812,29 +814,55 @@
        }

        /// <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;
            }
            //如果是自定义图片删除之前的
            if (!addSceneImageView.ImagePath.Contains("Gallery/scenebg"))

            try
            {
                Utlis.WriteLine("删除: " + addSceneImageView.ImagePath);
                System.IO.File.Delete(addSceneImageView.ImagePath);
                var mPath = imagePath;
                MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);

#if __IOS__


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

                if (pageTitleId == StringId.EditScene)
                {
                    scene.SaveFunctionData();
                }
            }
            catch
            {

            }

            MainPage.Log("SelectPicture 裁剪图片返回
路径: " + imagePath);
            FileUtils.FileCopyToRootPath(imagePath, imageName);
            System.IO.File.Delete(imagePath);

            scene.ImagePath = imageName;
            addSceneImageView.ImagePath = imageName;
        }

        /// <summary>