From b800fbdf874cdc75ddc137ea2c22ac2c25d8b45c Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 26 十一月 2019 10:10:37 +0800
Subject: [PATCH] 2019.11.26
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 251 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 236 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index bd256dd..0a8979a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -12,6 +12,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 瀹屾垚娣诲姞鎴块棿鐨勪簨浠�
+ /// </summary>
+ public Action FinishEditorEvent = null;
+ /// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
private VerticalListControl listview = null;
@@ -85,19 +89,23 @@
//搴曠嚎
txtRoomName.AddBottomLine();
- //銆愭墍灞炴ゼ灞傘��
- var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.floorKeys], this.listview.rowSpace / 2);
- listview.AddChidren(btnBelone);
- btnBelone.InitControl();
- //鍙崇澶�
- btnBelone.AddRightArrow();
- //搴曠嚎
- btnBelone.AddBottomLine();
- btnBelone.ButtonClickEvent += (sender, e) =>
+ //璇PP涓烘湁妤煎眰鐨勬ā寮忔墠寮�鍚繖涓彍鍗�
+ if (floorKeys != string.Empty)
{
- //妤煎眰閫夋嫨
- this.ShowSelectFloor(btnBelone);
- };
+ //銆愭墍灞炴ゼ灞傘��
+ var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.floorKeys], 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);
@@ -110,6 +118,8 @@
rowTemperature.AddBottomLine();
rowTemperature.ButtonClickEvent += (sender, e) =>
{
+ //鏄剧ず娓╁害浼犳劅鍣ㄥ垪琛�
+ this.ShowTemperatrueDevice(btnTemper);
};
//銆愭箍搴︺��
@@ -123,6 +133,8 @@
rowHumidity.AddBottomLine();
rowHumidity.ButtonClickEvent += (sender, e) =>
{
+ //鏄剧ず婀垮害浼犳劅鍣ㄥ垪琛�
+ this.ShowHumidityDevice(btnHumi);
};
//鍒濆鍖栨甯冨畬鎴�
@@ -148,6 +160,8 @@
}
else
{
+ this.FinishEditorEvent?.Invoke();
+
this.CloseForm();
}
};
@@ -191,6 +205,200 @@
#endregion
+ #region 鈻� 娓╁害浼犳劅鍣ㄧ浉鍏砡____________________
+
+ /// <summary>
+ /// 鏄剧ず娓╁害浼犳劅鍣ㄥ垪琛�
+ /// </summary>
+ /// <param name="btnTemper"></param>
+ private void ShowTemperatrueDevice(NormalViewControl btnTemper)
+ {
+ var listDevice = new List<ZigBee.Device.CommonDevice>();
+ foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ {
+ //鑾峰彇娓╁害浼犳劅鍣�
+ if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
+ {
+ listDevice.Add(device);
+ }
+ }
+ var listSelect = new List<string>() { newRoom.TemperatrueDevice };
+ var form = new SelectDeviceForm();
+ form.AddForm(listDevice, listSelect, true, true);
+ form.ActionSelectDevice += (list) =>
+ {
+ if (list.Count == 0)
+ {
+ newRoom.TemperatrueDevice = string.Empty;
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
+ return;
+ }
+ newRoom.TemperatrueDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
+ //鑾峰彇娓╁害鍊�
+ this.GetTemperatrueValue(btnTemper, newRoom.TemperatrueDevice);
+ };
+ }
+
+ /// <summary>
+ /// 鑾峰彇娓╁害鍊�
+ /// </summary>
+ /// <param name="btnHumi"></param>
+ /// <param name="deviceKey"></param>
+ private void GetTemperatrueValue(NormalViewControl btnTemper, string deviceKey)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(deviceKey);
+ if (device == null)
+ {
+ return;
+ }
+ //鑾峰彇涓�...
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+
+ HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (newRoom.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)
+ {
+ //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, ".") + "鈩�";
+ }
+ }
+ }
+ }));
+ //鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
+ ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ }
+
+ #endregion
+
+ #region 鈻� 婀垮害浼犳劅鍣ㄧ浉鍏砡____________________
+
+ /// <summary>
+ /// 鏄剧ず婀垮害浼犳劅鍣ㄥ垪琛�
+ /// </summary>
+ /// <param name="btnHumi"></param>
+ private void ShowHumidityDevice(NormalViewControl btnHumi)
+ {
+ var listDevice = new List<ZigBee.Device.CommonDevice>();
+ foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ {
+ //鑾峰彇婀垮害浼犳劅鍣�
+ if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)
+ {
+ listDevice.Add(device);
+ }
+ }
+ var listSelect = new List<string>() { newRoom.HumidityDevice };
+ var form = new SelectDeviceForm();
+ form.AddForm(listDevice, listSelect, true, true);
+ form.ActionSelectDevice += (list) =>
+ {
+ if (list.Count == 0)
+ {
+ newRoom.HumidityDevice = string.Empty;
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
+ return;
+ }
+ newRoom.HumidityDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
+ //鑾峰彇婀垮害鍊�
+ this.GetHumidityValue(btnHumi, newRoom.HumidityDevice);
+ };
+ }
+
+ /// <summary>
+ /// 鑾峰彇婀垮害鍊�
+ /// </summary>
+ /// <param name="btnHumi"></param>
+ /// <param name="deviceKey"></param>
+ private void GetHumidityValue(NormalViewControl btnHumi, string deviceKey)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(deviceKey);
+ if (device == null)
+ {
+ return;
+ }
+ //鑾峰彇涓�...
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+
+ HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+ HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (newRoom.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)
+ {
+ //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, ".") + "%";
+ }
+ }
+ }
+ });
+ //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
+ ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseForm()
+ {
+ this.FinishEditorEvent = null;
+
+ HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+ HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+
+ base.CloseForm();
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
@@ -205,11 +413,24 @@
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName));
return false;
}
- if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name) != null)
+ if (string.IsNullOrEmpty(this.floorKeys) == true)
{
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
- return false;
+ if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
+ {
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
+ return false;
+ }
}
+ else
+ {
+ var listRoom = Common.Room.CurrentRoom.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);
--
Gitblit v1.8.0