From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 93 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 33a4e14..685a2ac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -27,6 +27,10 @@
/// 鍏嬮殕瀵硅薄
/// </summary>
private Common.Room cloneRoom = null;
+ /// <summary>
+ /// 鏀瑰彉鎴块棿鍥剧墖
+ /// </summary>
+ private bool changedRoomPic = false;
#endregion
@@ -68,6 +72,10 @@
//鎴块棿鍥剧墖閫夋嫨
this.RoomPictrueSelect(btnPic);
};
+ //娣诲姞闃村奖鐗规晥
+ var btnTemp = new ButtonBase();
+ btnTemp.AddBottomShadow(btnPic, true);
+ btnTemp = null;
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
@@ -167,19 +175,42 @@
{
return;
}
- if (editorRoom.BackgroundImageType == 1 || editorRoom.BackgroundImageType == 2)
+ //鏇存敼鍥剧墖
+ if (this.changedRoomPic == true)
{
- //鐢熸垚鍥剧墖
- string picName = $"Room_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
- string picFullName = System.IO.Path.Combine(Common.Config.Instance.FullPath, picName);
- Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
- editorRoom.BackgroundImage = picFullName;
- //澶囦唤
- HdlAutoBackupLogic.AddOrEditorFile(picName);
+ if (editorRoom.BackgroundImageType == 1 || editorRoom.BackgroundImageType == 2)
+ {
+ //鍒犻櫎鎺夊師鏉ョ殑鑷畾涔夊浘鐗�
+ if (System.IO.File.Exists(editorRoom.BackgroundImage) == true)
+ {
+ System.IO.File.Delete(editorRoom.BackgroundImage);
+ }
+ //澶囦唤
+ string[] MyArry = editorRoom.BackgroundImage.Split(new string[] { "/", @"\" }, StringSplitOptions.RemoveEmptyEntries);
+ HdlAutoBackupLogic.DeleteFile(MyArry[MyArry.Length - 1]);
+ }
+ //鑷畾涔夊浘鐗�
+ if (cloneRoom.BackgroundImageType == 1 || cloneRoom.BackgroundImageType == 2)
+ {
+ //鐢熸垚鍥剧墖
+ string picName = $"RoomIcon_{DateTime.Now.ToString("yyyyMMddHHmmss")}.png";
+ string picFullName = System.IO.Path.Combine(Common.Config.Instance.FullPath, picName);
+ Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
+ cloneRoom.BackgroundImage = picFullName;
+ //澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(picName);
+ }
}
+
+ editorRoom.FloorId = cloneRoom.FloorId;
+ editorRoom.Name = cloneRoom.Name;
+ editorRoom.HumidityDevice = cloneRoom.HumidityDevice;
+ editorRoom.TemperatrueDevice = cloneRoom.TemperatrueDevice;
+ editorRoom.BackgroundImage = cloneRoom.BackgroundImage;
+ editorRoom.BackgroundImageType = cloneRoom.BackgroundImageType;
editorRoom.Save();
- FinishEditorEvent?.Invoke(this.cloneRoom.Name);
+ FinishEditorEvent?.Invoke(this.editorRoom.Name);
this.CloseForm();
};
}
@@ -271,8 +302,8 @@
//鑾峰彇涓�...
btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (Action<ZigBee.Device.CommonDevice>)((report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null)
@@ -280,7 +311,7 @@
return;
}
//绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
@@ -364,8 +395,8 @@
//鑾峰彇涓�...
btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null)
@@ -373,7 +404,7 @@
return;
}
//绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -422,9 +453,11 @@
{
return;
}
+ this.changedRoomPic = true;
this.cloneRoom.BackgroundImageType = 0;
this.cloneRoom.BackgroundImage = imgPath;
- imageContr.ImagePath = imgPath;
+ imgPath = IO.FileUtils.GetImageFilePath(imgPath);
+ imageContr.ImageBytes = IO.FileUtils.ReadFile(imgPath);
};
});
//鎷嶇収
@@ -437,6 +470,7 @@
{
return;
}
+ this.changedRoomPic = true;
this.cloneRoom.BackgroundImageType = 1;
imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
System.IO.File.Delete(imagePath);
@@ -452,6 +486,7 @@
{
return;
}
+ this.changedRoomPic = true;
this.cloneRoom.BackgroundImageType = 2;
imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
System.IO.File.Delete(imagePath);
@@ -467,14 +502,14 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
this.FinishEditorEvent = null;
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
@@ -510,24 +545,6 @@
return false;
}
}
- if (editorRoom.BackgroundImageType == 1 || editorRoom.BackgroundImageType == 2)
- {
- //鍒犻櫎鎺夊師鏉ョ殑鑷畾涔夊浘鐗�
- if (System.IO.File.Exists(editorRoom.BackgroundImage) == true)
- {
- System.IO.File.Delete(editorRoom.BackgroundImage);
- }
- //澶囦唤
- string[] MyArry = editorRoom.BackgroundImage.Split(new string[] { "/", @"\" }, StringSplitOptions.RemoveEmptyEntries);
- HdlAutoBackupLogic.DeleteFile(MyArry[MyArry.Length - 1]);
- }
- editorRoom.FloorId = cloneRoom.FloorId;
- editorRoom.Name = cloneRoom.Name;
- editorRoom.HumidityDevice = cloneRoom.HumidityDevice;
- editorRoom.TemperatrueDevice = cloneRoom.TemperatrueDevice;
- editorRoom.BackgroundImage = cloneRoom.BackgroundImage;
- editorRoom.BackgroundImageType = cloneRoom.BackgroundImageType;
- cloneRoom = null;
return true;
}
--
Gitblit v1.8.0