From c47c3ec2488961b3a006aaebcb03dba582f8b19b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 12 三月 2020 17:08:42 +0800
Subject: [PATCH] 2020-03-12-1
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 329 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 251 insertions(+), 78 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index d4b328f..05ce2f0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -12,6 +12,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 缁撴潫缂栬緫鐨勪簨浠�
+ /// </summary>
+ public Action<string> FinishEditorEvent = null;
+ /// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
private VerticalListControl listview = null;
@@ -23,6 +27,10 @@
/// 鍏嬮殕瀵硅薄
/// </summary>
private Common.Room cloneRoom = null;
+ /// <summary>
+ /// 鏀瑰彉鎴块棿鍥剧墖
+ /// </summary>
+ private bool changedRoomPic = false;
#endregion
@@ -34,8 +42,18 @@
/// <param name="i_editorRoom">缂栬緫鐨勬埧闂村璞�</param>
public void ShowForm(Common.Room i_editorRoom = null)
{
+ //寮勪竴鐐瑰垵濮嬪��
this.editorRoom = i_editorRoom;
- this.cloneRoom = i_editorRoom.CloneRoomClass();
+ this.cloneRoom = HdlRoomLogic.Current.CloneRoomClass(i_editorRoom);
+ if (i_editorRoom.HumidityDevice == string.Empty)
+ {
+ this.cloneRoom.Humidity = -1000;
+ }
+ if (i_editorRoom.TemperatrueDevice == string.Empty)
+ {
+ this.cloneRoom.Temperatrue = -1000;
+ }
+
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorRoom));
@@ -51,18 +69,39 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- var btnPic = new PicViewControl(887, 444);
+ //鎴块棿鍥剧墖
+ var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
+ btnPic.Width = Application.GetMinRealAverage(887);
+ btnPic.Height = Application.GetMinRealAverage(444);
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.UnSelectedImagePath = this.cloneRoom.BackgroundImage;
+ if (this.editorRoom.BackgroundImageType == 0)
+ {
+ btnPic.ImagePath = this.editorRoom.BackgroundImage;
+ }
+ else
+ {
+ btnPic.ImageBytes = Common.Global.ReadFileByHomeId(this.editorRoom.BackgroundImage);
+ }
bodyFrameLayout.AddChidren(btnPic);
+ var btnShadow = new PicViewControl(916, 487);
+ btnShadow.Y = btnPic.Y;
+ btnShadow.Gravity = Gravity.CenterHorizontal;
+ btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
+ bodyFrameLayout.AddChidren(btnShadow);
+ btnShadow.ButtonClickEvent += (sender, e) =>
+ {
+ //鎴块棿鍥剧墖閫夋嫨
+ this.RoomPictrueSelect(btnPic);
+ };
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
//娣诲姞鍏ㄩ儴鑿滃崟
- this.AddAllMenuRow(tableContr);
+ this.AddAllMenuRow(tableContr, btnPic);
}
#endregion
@@ -72,7 +111,7 @@
/// <summary>
/// 娣诲姞鍏ㄩ儴鑿滃崟
/// </summary>
- private void AddAllMenuRow(InformationEditorControl tableContr)
+ private void AddAllMenuRow(InformationEditorControl tableContr, ImageView btnPic)
{
//銆愭埧闂村悕绉般��
var txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), this.cloneRoom.Name, this.listview.rowSpace / 2);
@@ -82,19 +121,23 @@
//搴曠嚎
txtRoomName.AddBottomLine();
- //銆愭墍灞炴ゼ灞傘��
- var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.cloneRoom.FloorId], this.listview.rowSpace / 2);
- listview.AddChidren(btnBelone);
- btnBelone.InitControl();
- //鍙崇澶�
- btnBelone.AddRightArrow();
- //搴曠嚎
- btnBelone.AddBottomLine();
- btnBelone.ButtonClickEvent += (sender, e) =>
+ //璇PP涓烘湁妤煎眰鐨勬ā寮忔墠寮�鍚繖涓彍鍗�
+ if (string.IsNullOrEmpty(this.cloneRoom.FloorId) == false)
{
- //妤煎眰閫夋嫨
- this.ShowSelectFloor(btnBelone);
- };
+ //銆愭墍灞炴ゼ灞傘��
+ var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.cloneRoom.FloorId], this.listview.rowSpace / 2);
+ listview.AddChidren(btnBelone);
+ btnBelone.InitControl();
+ //鍙崇澶�
+ btnBelone.AddRightArrow();
+ //搴曠嚎
+ btnBelone.AddBottomLine();
+ btnBelone.ButtonClickEvent += (sender, e) =>
+ {
+ //妤煎眰閫夋嫨
+ this.ShowSelectFloor(btnBelone);
+ };
+ }
//銆愭俯搴︺��
var rowTemperature = new FrameRowControl(this.listview.rowSpace / 2);
@@ -151,7 +194,43 @@
{
return;
}
+ //鏇存敼鍥剧墖
+ if (this.changedRoomPic == true)
+ {
+ if (editorRoom.BackgroundImageType == 1 || editorRoom.BackgroundImageType == 2)
+ {
+ //鍒犻櫎鎺夊師鏉ョ殑鑷畾涔夊浘鐗�
+ if (Common.Global.IsExistsByHomeId(editorRoom.BackgroundImage) == true)
+ {
+ Common.Global.DeleteFilebyHomeId(editorRoom.BackgroundImage);
+ }
+ //澶囦唤
+ HdlAutoBackupLogic.DeleteFile(editorRoom.BackgroundImage);
+ }
+ //鑷畾涔夊浘鐗�
+ 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 = picName;
+ //澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(picName);
+ }
+ }
+
+ editorRoom.FloorId = cloneRoom.FloorId;
+ editorRoom.Name = cloneRoom.Name;
+ editorRoom.HumidityDevice = cloneRoom.HumidityDevice;
+ editorRoom.Humidity = cloneRoom.Humidity;
+ editorRoom.TemperatrueDevice = cloneRoom.TemperatrueDevice;
+ editorRoom.Temperatrue = cloneRoom.Temperatrue;
+ editorRoom.BackgroundImage = cloneRoom.BackgroundImage;
+ editorRoom.BackgroundImageType = cloneRoom.BackgroundImageType;
editorRoom.Save();
+
+ FinishEditorEvent?.Invoke(this.editorRoom.Name);
this.CloseForm();
};
}
@@ -166,7 +245,7 @@
/// <param name="control"></param>
private void ShowSelectFloor(FrameCaptionViewControl control)
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
var listKeys = new List<string>();
var listName = new List<string>();
@@ -240,44 +319,58 @@
{
return;
}
- //鑾峰彇涓�...
- btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ if (cloneRoom.Temperatrue == -1000)
+ {
+ //娌℃湁鑾峰彇寰楀埌杩囨俯搴�
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ }
+ else
+ {
+ btnTemper.Text = this.cloneRoom.Temperatrue == 0 ? "0.0鈩�" : this.cloneRoom.Temperatrue.ToString() + "鈩�";
+ btnTemper.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
+ }
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null)
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
- if (data.AttriButeData == 0)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //0鈩�
- btnTemper.Text = "0.0鈩�";
- }
- else if (data.AttriButeData > 32767)
- {
- //璐熸暟(鐗规畩澶勭悊)
- string strValue = (data.AttriButeData - 65536).ToString();
- //灏忔暟鐐归渶瑕佷竴浣�
- strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- }
+ if (data.AttriButeData == 0)
+ {
+ //0鈩�
+ btnTemper.Text = "0.0鈩�";
+ this.cloneRoom.Temperatrue = 0;
+ }
+ else if (data.AttriButeData > 32767)
+ {
+ //璐熸暟(鐗规畩澶勭悊)
+ string strValue = (data.AttriButeData - 65536).ToString();
+ //灏忔暟鐐归渶瑕佷竴浣�
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
+ }
+ });
}
}
}));
@@ -333,35 +426,47 @@
{
return;
}
- //鑾峰彇涓�...
- btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ if (cloneRoom.Humidity == -1000)
+ {
+ //娌℃湁鑾峰彇寰楀埌杩囨箍搴�
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ }
+ else
+ {
+ btnHumi.Text = this.cloneRoom.Humidity == 0 ? "0.0%" : this.cloneRoom.Humidity.ToString() + "%";
+ btnHumi.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
+ }
- 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)
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
- if (data.AttriButeData == 0)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //0
- btnHumi.Text = "0.0%";
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
- }
+ if (data.AttriButeData == 0)
+ {
+ //0
+ btnHumi.Text = "0.0%";
+ this.cloneRoom.Humidity = 0;
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍婀垮害
+ this.cloneRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";
+ }
+ });
}
}
});
@@ -371,17 +476,86 @@
#endregion
+ #region 鈻� 鎴块棿鍥剧墖閫夋嫨_______________________
+
+ /// <summary>
+ /// 鎴块棿鍥剧墖閫夋嫨
+ /// </summary>
+ /// <param name="imageContr"></param>
+ private void RoomPictrueSelect(ImageView imageContr)
+ {
+ var menuContr = new BottomMenuSelectForm();
+ menuContr.AddForm(3);
+ //榛樿鍥惧簱
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
+ {
+ var localPic = new Phone.Device.Room.AddRoomSelectPicByLocal();
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ localPic.Show();
+ localPic.action = (imgPath) =>
+ {
+ if (string.IsNullOrEmpty(imgPath) == true)
+ {
+ return;
+ }
+ this.changedRoomPic = true;
+ this.cloneRoom.BackgroundImageType = 0;
+ this.cloneRoom.BackgroundImage = imgPath;
+ imgPath = IO.FileUtils.GetImageFilePath(imgPath);
+ imageContr.ImageBytes = IO.FileUtils.ReadFile(imgPath);
+ };
+ });
+ //鎷嶇収
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.Photograph), () =>
+ {
+ //閫氳繃鐩告満鎷嶇収瑁佸壀
+ CropImage.TakePicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ this.changedRoomPic = true;
+ this.cloneRoom.BackgroundImageType = 1;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+ }, "HdlPic", 2, 1);
+ });
+ //鎴戠殑鐩稿唽
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.MyAblums), () =>
+ {
+ //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+ CropImage.SelectPicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ this.changedRoomPic = true;
+ this.cloneRoom.BackgroundImageType = 2;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+
+ }, "HdlPic", 2, 1);
+ });
+ }
+
+ #endregion
+
#region 鈻� 鐣岄潰鍏抽棴___________________________
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ this.FinishEditorEvent = null;
- base.CloseForm();
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+
+ base.CloseFormBefore();
}
#endregion
@@ -400,24 +574,23 @@
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName));
return false;
}
- if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.cloneRoom.Name && obj.Id != this.cloneRoom.Id) != null)
+ if (string.IsNullOrEmpty(this.cloneRoom.FloorId) == true)
{
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
- return false;
+ if (HdlRoomLogic.Current.GetAllListRooms().Find((obj) => obj.Name == this.cloneRoom.Name && obj.Id != this.cloneRoom.Id) != null)
+ {
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
+ return false;
+ }
}
- if (cloneRoom.BackgroundImageType == 1 || cloneRoom.BackgroundImageType == 2)
+ else
{
- this.cloneRoom.MoveBackGroundIamageFileToDirectory(cloneRoom.BackgroundImage, cloneRoom.BackgroundImage);
- this.cloneRoom.BackgroundImage = $"{Common.Config.Instance.Guid}/{Common.Config.Instance.HomeId}/{cloneRoom.BackgroundImage}";
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.cloneRoom.FloorId);
+ if (listRoom.Find((obj) => obj.Name == this.cloneRoom.Name && obj.Id != this.cloneRoom.Id) != null)
+ {
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
+ return false;
+ }
}
-
- 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