From 5efaaab958a0f4a91ad9d76b5d5fea0ea3fc3f41 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 01 十二月 2020 16:24:19 +0800
Subject: [PATCH] 2020-12-01 1.请求路径修改。 2.切换住宅或者查询住宅列表增加获取网关列表。 3.房间增加默认图片选择、比例调整为16：9。4.优化图片裁剪。
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 5a248d2..4654e69 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/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濡傛灉鏄畨鍗撻渶瑕佹嫹璐濆洖鏉PP鏍圭洰褰�
+ 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>
--
Gitblit v1.8.0