From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 246 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 184 insertions(+), 62 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index a737171..08fce6b 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
@@ -55,18 +59,45 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- var btnPic = new PicViewControl(887, 444);
- btnPic.Y = Application.GetRealHeight(60);
- btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.UnSelectedImagePath = this.cloneRoom.BackgroundImage;
- bodyFrameLayout.AddChidren(btnPic);
+ //鎴块棿鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Y = Application.GetRealHeight(60);
+ framePic.Width = Application.GetMinRealAverage(887);
+ framePic.Height = Application.GetMinRealAverage(444);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Radius = (uint)Application.GetRealHeight(17);
+ framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
+ bodyFrameLayout.AddChidren(framePic);
+ var btnPic = new ImageView();
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
+ framePic.AddChidren(btnPic);
+ if (this.editorRoom.BackgroundImageType == 0)
+ {
+ btnPic.ImagePath = this.editorRoom.BackgroundImage;
+ }
+ else
+ {
+ btnPic.ImageBytes = Common.Global.ReadFileByHomeId(this.editorRoom.BackgroundImage);
+ }
+ //鍦ㄤ笂闈㈡斁涓�灞傞槾褰�
+ var btnPicBack = new FrameLayout();
+ btnPicBack.Radius = (uint)Application.GetRealHeight(17);
+ btnPicBack.BackgroundColor = 0x26000000;
+ framePic.AddChidren(btnPicBack);
+ btnPicBack.MouseUpEventHandler += (sender, e) =>
+ {
+ //鎴块棿鍥剧墖閫夋嫨
+ this.RoomPictrueSelect(btnPic);
+ };
+ //娣诲姞闃村奖鐗规晥
+ framePic.SetViewShadow(true);
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
//娣诲姞鍏ㄩ儴鑿滃崟
- this.AddAllMenuRow(tableContr);
+ this.AddAllMenuRow(tableContr, btnPic);
}
#endregion
@@ -76,7 +107,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);
@@ -159,9 +190,41 @@
{
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.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();
};
}
@@ -253,8 +316,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璁惧灞炴�т笂鎶�, ((report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null)
@@ -262,32 +325,35 @@
return;
}
//绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.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鈩�";
+ }
+ 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, ".") + "鈩�";
+ }
+ });
}
}
}));
@@ -346,8 +412,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)
@@ -355,23 +421,26 @@
return;
}
//绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.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%";
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
+ }
+ });
}
}
});
@@ -381,19 +450,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()
{
this.FinishEditorEvent = null;
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
@@ -429,20 +565,6 @@
return false;
}
}
-
- if (cloneRoom.BackgroundImageType == 1 || cloneRoom.BackgroundImageType == 2)
- {
- this.cloneRoom.MoveBackGroundIamageFileToDirectory(cloneRoom.BackgroundImage, cloneRoom.BackgroundImage);
- this.cloneRoom.BackgroundImage = $"{Common.Config.Instance.Guid}/{Common.Config.Instance.HomeId}/{cloneRoom.BackgroundImage}";
- }
-
- 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