From 9c607e921ca7c379799e4dd88b140265a1d5d5c5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 22 十一月 2019 16:35:30 +0800
Subject: [PATCH] 需要合并
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index a9e7def..019f512 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -33,7 +33,17 @@
/// <summary>
/// IconPathType
/// </summary>
- public int IconPathType = 0;
+ public int IconPathType;
+ /// <summary>
+ /// OldBackgroundImagePath
+ /// </summary>
+ private string OldBackgroundImagePath;
+
+ /// <summary>
+ /// OldIconPathType
+ /// </summary>
+ public int OldIconPathType;
+
#endregion
@@ -49,6 +59,11 @@
{
room = r;
IconPathType = r.BackgroundImageType;
+ OldIconPathType= r.BackgroundImageType;
+ if (IconPathType != 1)
+ {
+ OldBackgroundImagePath = r.BackgroundImage;
+ }
AddTop();
AddBodyView();
@@ -383,6 +398,10 @@
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
var fileName = $"Room_{tradeTime}";
room.Name = nameRow.NameText.Text.Trim();
+ if (OldIconPathType != 1)
+ {
+ Shared.IO.FileUtils.DeleteFile(OldBackgroundImagePath);
+ }
if (IconPathType == 0)
{
room.BackgroundImage = backGround.UnSelectedImagePath;
@@ -394,6 +413,7 @@
}
room.BackgroundImageType = IconPathType;
room.Save();
+ action?.Invoke();
RemoveFromParent();
};
@@ -523,7 +543,7 @@
{
selectFL.RemoveFromParent();
var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"Room_{tradeTime}";
+ var fileName = $"RoomIcon_{tradeTime}.png";
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
--
Gitblit v1.8.0