From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index a74fd3e..8cd2f51 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/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()
{
@@ -68,9 +68,9 @@
{
foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
{
- if (f.roomIdList.Contains(room.sid))
+ if (f.roomIds.Contains(room.sid))
{
- f.roomIdList.Remove(room.sid);
+ f.roomIds.Remove(room.sid);
}
}
DB_ResidenceData.DelRoom(room);
@@ -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濡傛灉鏄畨鍗撻渶瑕佹嫹璐濆洖鏉PP鏍圭洰褰�
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 { }
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0