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 | 302 +++++++++++++++++++++++++++++++++----------------
1 files changed, 203 insertions(+), 99 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 4798b97..753bf16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -60,15 +60,11 @@
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
- frameBack1.Height = Application.GetRealHeight(450);
+ 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 tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
var btnShadow = new PicViewControl(853, 593);
@@ -100,14 +96,13 @@
this.RoomPictrueSelect(btnPic);
};
- //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
- frameBack1.Y = btnPic.Y + btnPic.Height / 2;
-
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
newRoom.BackgroundImage = btnPic.ImagePath;
- newRoom.Humidity = -1000;
- newRoom.Temperatrue = -1000;
+
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -125,6 +120,7 @@
//銆愭埧闂村悕绉般��
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();
//搴曠嚎
@@ -201,21 +197,13 @@
Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
newRoom.BackgroundImage = picName;
//澶囦唤
- Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);
+ HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(picName);
}
newRoom.FloorId = this.floorKeys;
- if (newRoom.Humidity == -1000)
- {
- newRoom.Humidity = 0;
- }
- if (newRoom.Temperatrue == -1000)
- {
- newRoom.Temperatrue = 0;
- }
//娣诲姞鎴块棿,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
HdlRoomLogic.Current.AddRoom(newRoom);
this.FinishEditorEvent?.Invoke();
@@ -271,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);
}
@@ -290,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);
};
@@ -303,68 +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;
}
- if (newRoom.Temperatrue == -1000)
- {
- //娌℃湁鑾峰彇寰楀埌杩囨俯搴�
- btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
- }
- else
- {
- btnTemper.Text = this.newRoom.Temperatrue == 0 ? "0.0鈩�" : this.newRoom.Temperatrue.ToString() + "鈩�";
- btnTemper.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
- }
+ //鑾峰彇涓�
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ 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;
}
+ 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)
{
- HdlThreadLogic.Current.RunMain(() =>
- {
- if (data.AttriButeData == 0)
- {
- //0鈩�
- btnTemper.Text = "0.0鈩�";
- this.newRoom.Temperatrue = 0;
- }
- else if (data.AttriButeData > 32767)
- {
- //璐熸暟(鐗规畩澶勭悊)
- string strValue = (data.AttriButeData - 65536).ToString();
- //灏忔暟鐐归渶瑕佷竴浣�
- strValue = strValue.Substring(0, strValue.Length - 1);
- //璁板綍娓╁害
- this.newRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- btnTemper.Text = this.newRoom.Temperatrue.ToString() + "鈩�";
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- //璁板綍娓╁害
- this.newRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- btnTemper.Text = this.newRoom.Temperatrue.ToString() + "鈩�";
- }
- });
+ //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
@@ -378,14 +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);
}
@@ -401,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);
};
@@ -414,55 +463,110 @@
/// <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;
}
- if (newRoom.Humidity == -1000)
- {
- //娌℃湁鑾峰彇寰楀埌杩囨箍搴�
- btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
- }
- else
- {
- btnHumi.Text = this.newRoom.Humidity == 0 ? "0.0%" : this.newRoom.Humidity.ToString() + "%";
- btnHumi.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
- }
+ //鑾峰彇涓�
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ 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;
}
- 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)
{
+ //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(() =>
{
- decimal humidity = (decimal)device.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, device, null);
- if (humidity == 0)
- {
- //0
- btnHumi.Text = "0.0%";
- this.newRoom.Humidity = 0;
- }
- else
- {
- //璁板綍婀垮害
- this.newRoom.Humidity = humidity;
- btnHumi.Text = this.newRoom.Humidity.ToString() + "%";
- }
+ btnHumi.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
});
+ break;
}
}
});
- //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- device.GetType().InvokeMember("ReadTemperatureOrHumidity", System.Reflection.BindingFlags.InvokeMethod, null, device, null);
+ }
+
+ /// <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
--
Gitblit v1.8.0