From 2294816f28804660a441038b5cc89921703f4f41 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 26 十一月 2019 17:57:28 +0800
Subject: [PATCH] 2019.11.26
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index a9e7def..2195468 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();
@@ -60,6 +75,7 @@
HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ CommonPage.Instance.IsDrawerLockMode = false;
base.RemoveFromParent();
}
@@ -383,6 +399,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 +414,7 @@
}
room.BackgroundImageType = IconPathType;
room.Save();
+ action?.Invoke();
RemoveFromParent();
};
@@ -523,7 +544,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