From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 433 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 339 insertions(+), 94 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 0a8979a..753bf16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -18,7 +18,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 妤煎眰涓婚敭
/// </summary>
@@ -54,22 +54,58 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- var btnPic = new PicViewControl(887, 444);
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
+ //鍔犱竴涓櫧鑹茶儗鏅�
+ var frameBack1 = new FrameLayout();
+ frameBack1.Height = Application.GetRealHeight(750);
+ frameBack1.Y = Application.GetRealHeight(196);
+ frameBack1.BackgroundColor = UserCenterColor.Current.White;
+ frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ listBackControl.frameTable.AddChidren(frameBack1);
+
+ //鎴块棿鍥剧墖搴曢儴闃村奖
+ var btnShadow = new PicViewControl(853, 593);
+ btnShadow.Y = Application.GetRealHeight(58);
+ btnShadow.Gravity = Gravity.CenterHorizontal;
+ btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
+ listBackControl.frameTable.AddChidren(btnShadow);
+ //鎴块棿鍥剧墖
+ var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
+ btnPic.Width = this.GetPictrueRealSize(824);
+ btnPic.Height = this.GetPictrueRealSize(549);
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.UnSelectedImagePath = "Room/r0.png";
- bodyFrameLayout.AddChidren(btnPic);
+ btnPic.ImagePath = "RoomIcon/0.jpg";
+ listBackControl.frameTable.AddChidren(btnPic);
+ //鍥剧墖閬僵
+ var btnZhezhao = new FrameLayout();
+ btnZhezhao.Width = btnPic.Width;
+ btnZhezhao.Height = btnPic.Height;
+ btnZhezhao.Y = btnPic.Y;
+ btnZhezhao.Gravity = Gravity.CenterHorizontal;
+ btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
+ btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
+ listBackControl.frameTable.AddChidren(btnZhezhao);
+ btnZhezhao.MouseUpEventHandler += (sender, e) =>
+ {
+ //鎴块棿鍥剧墖閫夋嫨
+ this.RoomPictrueSelect(btnPic);
+ };
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
- newRoom.BackgroundImage = btnPic.UnSelectedImagePath;
+ newRoom.BackgroundImage = btnPic.ImagePath;
- //鍒濆鍖栨甯�
+ //鍒濆鍖栦俊鎭甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
//娣诲姞鍏ㄩ儴鑿滃崟
- this.AddAllMenuRow(tableContr);
+ this.AddAllMenuRow(tableContr, btnPic);
}
#endregion
@@ -79,11 +115,12 @@
/// <summary>
/// 娣诲姞鍏ㄩ儴鑿滃崟
/// </summary>
- private void AddAllMenuRow(InformationEditorControl tableContr)
+ private void AddAllMenuRow(InformationEditorControl tableContr, ImageView btnPic)
{
//銆愭埧闂村悕绉般��
var txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), string.Empty, this.listview.rowSpace / 2);
txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
+ txtRoomName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(txtRoomName);
txtRoomName.InitControl();
//搴曠嚎
@@ -138,7 +175,7 @@
};
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -152,18 +189,26 @@
{
return;
}
- var result = newRoom.AddRoom(newRoom);
- if (result == false)
+ if (newRoom.BackgroundImageType == 1 || newRoom.BackgroundImageType == 2)
{
- //鎻愮ず鐢ㄦ埛娣诲姞澶辫触
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.FAIL));
+ //鐢熸垚鍥剧墖
+ 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);
+ newRoom.BackgroundImage = picName;
+ //澶囦唤
+ HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(picName);
}
- else
- {
- this.FinishEditorEvent?.Invoke();
- this.CloseForm();
- }
+ newRoom.FloorId = this.floorKeys;
+
+ //娣诲姞鎴块棿,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
+ HdlRoomLogic.Current.AddRoom(newRoom);
+ this.FinishEditorEvent?.Invoke();
+
+ this.CloseForm();
};
}
@@ -177,7 +222,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>();
@@ -214,10 +259,15 @@
private void ShowTemperatrueDevice(NormalViewControl btnTemper)
{
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)
{
//鑾峰彇娓╁害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
{
listDevice.Add(device);
}
@@ -233,7 +283,7 @@
btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- newRoom.TemperatrueDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
+ newRoom.TemperatrueDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇娓╁害鍊�
this.GetTemperatrueValue(btnTemper, newRoom.TemperatrueDevice);
};
@@ -246,54 +296,118 @@
/// <param name="deviceKey"></param>
private void GetTemperatrueValue(NormalViewControl btnTemper, string deviceKey)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
if (device == null)
{
return;
}
- //鑾峰彇涓�...
- btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ //鑾峰彇涓�
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+ bool receiveData = false;
+ HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
- if (newRoom.TemperatrueDevice != mainKeys || btnTemper == null)
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
+ if (newRoom.TemperatrueDevice != mainKeys || btnTemper == null
+ || report.DeviceStatusReport.CluterID != 1026)
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+ receiveData = true;
- foreach (var data in report.DeviceStatusReport.AttriBute)
+ HdlThreadLogic.Current.RunMain(() =>
{
- if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ decimal temperatrue = (decimal)device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, device, null);
+ if (temperatrue == 0)
{
- 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, ".") + "鈩�";
- }
+ //0
+ btnTemper.Text = "0.0鈩�";
}
- }
+ else
+ {
+ btnTemper.Text = temperatrue + "鈩�";
+ }
+
+ }, ShowErrorMode.NO);
+
}));
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
- ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ device.ReadAttri(ZigBee.Device.Cluster_ID.TemperatureMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
+ System.Threading.Thread.Sleep(1500);
+ var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
+ if (result != null)
+ {
+ device.AttributeStatus.Clear();
+ device.AttributeStatus.AddRange(result.AttributeStatus);
+ device.ReSave();
+ }
+ if (receiveData == true)
+ {
+ //宸茬粡璇诲彇鍒版暟鎹�
+ return;
+ }
+
+ foreach (var data in device.AttributeStatus)
+ {
+ if (data.ClusterId == 1026
+ && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ //澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
+ decimal temperatrue = 0;
+ this.AdjustTemperatrueValue(data.AttributeData, ref temperatrue);
+
+ device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });
+ device.ReSave();
+
+ //鍒朵綔铏氬亣鐨勫睘鎬т笂鎶�
+ var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };
+ report.DeviceStatusReport.CluterID = 1026;
+ HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnTemper.Text = temperatrue == 0 ? "0.0鈩�" : temperatrue.ToString() + "鈩�";
+ });
+ break;
+ }
+ }
+ });
+ }
+
+ /// <summary>
+ /// 澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
+ /// </summary>
+ /// <param name="value">缃戝叧杩斿洖鐨勫睘鎬у��</param>
+ /// <param name="temperatrue">杞崲鎴愮殑娓╁害鍊�</param>
+ private void AdjustTemperatrueValue(int value, ref decimal temperatrue)
+ {
+ if (value == 0)
+ {
+ //0鈩�
+ temperatrue = 0;
+ }
+ else if (value > 32767)
+ {
+ //璐熸暟(鐗规畩澶勭悊)
+ string strValue = (value - 65536).ToString();
+ //灏忔暟鐐归渶瑕佷竴浣�
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = value.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
}
#endregion
@@ -307,10 +421,20 @@
private void ShowHumidityDevice(NormalViewControl btnHumi)
{
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)
{
//鑾峰彇婀垮害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)
+ {
+ listDevice.Add(device);
+ }
+ //鏂伴
+ else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
{
listDevice.Add(device);
}
@@ -326,7 +450,7 @@
btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- newRoom.HumidityDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
+ newRoom.HumidityDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇婀垮害鍊�
this.GetHumidityValue(btnHumi, newRoom.HumidityDevice);
};
@@ -339,45 +463,172 @@
/// <param name="deviceKey"></param>
private void GetHumidityValue(NormalViewControl btnHumi, string deviceKey)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
if (device == null)
{
return;
}
- //鑾峰彇涓�...
- btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ //鑾峰彇涓�
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
+ bool receiveData = false;
+ HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
- if (newRoom.HumidityDevice != mainKeys || btnHumi == null)
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
+ if (newRoom.HumidityDevice != mainKeys || btnHumi == null
+ || report.DeviceStatusReport.CluterID != 1029)
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
- foreach (var data in report.DeviceStatusReport.AttriBute)
+ receiveData = true;
+ HdlThreadLogic.Current.RunMain(() =>
{
- if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ decimal humidity = (decimal)device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, device, null);
+ if (humidity == 0)
{
- if (data.AttriButeData == 0)
+ //0
+ btnHumi.Text = "0.0%";
+ }
+ else
+ {
+ btnHumi.Text = humidity.ToString() + "%";
+ }
+
+ }, ShowErrorMode.NO);
+ });
+ //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
+ device.ReadAttri(ZigBee.Device.Cluster_ID.RelativeHumidityMeasurement, ZigBee.Device.AttriButeId.MeasuredValue);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
+ System.Threading.Thread.Sleep(1500);
+ var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
+ if (result != null)
+ {
+ device.AttributeStatus.Clear();
+ device.AttributeStatus.AddRange(result.AttributeStatus);
+ device.ReSave();
+ }
+ if (receiveData == true)
+ {
+ //宸茬粡璇诲彇鍒版暟鎹�
+ return;
+ }
+
+ //鍒濆鍊�,鍙栫紦瀛樻暟鎹�
+ foreach (var data in device.AttributeStatus)
+ {
+ if (data.ClusterId == 1029
+ && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+ {
+ //澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
+ decimal humidity = 0;
+ this.AdjustHumidityValue(data.AttributeData, ref humidity);
+
+ device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });
+ device.ReSave();
+
+ //鍒朵綔铏氬亣鐨勫睘鎬т笂鎶�
+ var report = new ZigBee.Device.CommonDevice { DeviceAddr = device.DeviceAddr, DeviceEpoint = device.DeviceEpoint };
+ report.DeviceStatusReport.CluterID = 1029;
+ HdlGatewayReceiveLogic.Current.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
+
+ 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, ".") + "%";
- }
+ btnHumi.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
+ });
+ break;
}
}
});
- //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ }
+
+ /// <summary>
+ /// 澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
+ /// </summary>
+ /// <param name="value">缃戝叧杩斿洖鐨勫睘鎬у��</param>
+ /// <param name="temperatrue">杞崲鎴愮殑婀垮害鍊�</param>
+ /// <param name="valueText">杞崲鎴愮殑婀垮害鍊肩殑缈昏瘧鏂囨湰</param>
+ private void AdjustHumidityValue(int value, ref decimal humidity)
+ {
+ if (value == 0)
+ {
+ //0%
+ humidity = 0;
+ }
+ //涓嶄細鍑虹幇璐熸暟
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = value.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
+ }
+
+ #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 form = new SelectLocalRoomImageForm();
+ form.AddForm();
+ form.FinishSelectEvent = (imgPath) =>
+ {
+ if (string.IsNullOrEmpty(imgPath) == true)
+ {
+ return;
+ }
+ this.newRoom.BackgroundImageType = 0;
+ this.newRoom.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.newRoom.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.newRoom.BackgroundImageType = 2;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+
+ }, "HdlPic", 2, 1);
+ });
}
#endregion
@@ -387,14 +638,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
@@ -415,7 +666,8 @@
}
if (string.IsNullOrEmpty(this.floorKeys) == true)
{
- if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
+ var listRoom = HdlRoomLogic.Current.GetAllListRooms();
+ if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
{
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
return false;
@@ -423,20 +675,13 @@
}
else
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);
if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
{
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
return false;
}
}
-
- if (newRoom.BackgroundImageType == 1 || newRoom.BackgroundImageType == 2)
- {
- this.newRoom.MoveBackGroundIamageFileToDirectory(newRoom.BackgroundImage, newRoom.BackgroundImage);
- this.newRoom.BackgroundImage = $"{Common.Config.Instance.Guid}/{Common.Config.Instance.HomeId}/{newRoom.BackgroundImage}";
- }
- newRoom.FloorId = this.floorKeys;
return true;
}
--
Gitblit v1.8.0