From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 89 ++++++++------------------------------------
1 files changed, 16 insertions(+), 73 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 505ebc9..cf138ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -264,7 +264,7 @@
Common.Global.DeleteFilebyHomeId(editorRoom.BackgroundImage);
}
//澶囦唤
- HdlBackupLogic.Current.DeleteAutoBackFileStatu(editorRoom.BackgroundImage);
+ HdlAutoBackupLogic.DeleteFile(editorRoom.BackgroundImage);
}
//鑷畾涔夊浘鐗�
if (cloneRoom.BackgroundImageType == 1 || cloneRoom.BackgroundImageType == 2)
@@ -275,7 +275,7 @@
Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
cloneRoom.BackgroundImage = picName;
//澶囦唤
- HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(picName);
+ HdlAutoBackupLogic.AddOrEditorFile(picName);
}
}
@@ -354,7 +354,7 @@
private void ShowTemperatrueDevice(NormalViewControl btnTemper)
{
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)
+ foreach (var device in Common.LocalDevice.Current.listAllDevice)
{
//鑾峰彇娓╁害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
@@ -378,7 +378,7 @@
btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- cloneRoom.TemperatrueDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
+ cloneRoom.TemperatrueDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇娓╁害鍊�
this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);
};
@@ -391,7 +391,7 @@
/// <param name="deviceKey"></param>
private void GetTemperatrueValue(NormalViewControl btnTemper, string deviceKey)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
+ var device = Common.LocalDevice.Current.GetDevice(deviceKey);
if (device == null)
{
return;
@@ -403,14 +403,14 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
{
- string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null
|| report.DeviceStatusReport.CluterID != 1026)
{
return;
}
receiveData = true;
- var localDevice = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
+ var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
decimal temperatrue = (decimal)device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, device, null);
@@ -433,7 +433,7 @@
{
//鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
System.Threading.Thread.Sleep(1500);
- var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
+ var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
if (result != null)
{
device.AttributeStatus.Clear();
@@ -452,8 +452,7 @@
&& data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
//澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
- decimal temperatrue = 0;
- this.AdjustTemperatrueValue(data.AttributeData, ref temperatrue);
+ decimal temperatrue = Common.LocalDevice.Current.AdjustTemperatrueValue(data.AttributeData);
device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });
device.ReSave();
@@ -473,37 +472,6 @@
});
}
- /// <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
#region 鈻� 婀垮害浼犳劅鍣ㄧ浉鍏砡____________________
@@ -515,7 +483,7 @@
private void ShowHumidityDevice(NormalViewControl btnHumi)
{
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)
+ foreach (var device in Common.LocalDevice.Current.listAllDevice)
{
//鑾峰彇婀垮害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)
@@ -544,7 +512,7 @@
btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- cloneRoom.HumidityDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
+ cloneRoom.HumidityDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇婀垮害鍊�
this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);
};
@@ -557,7 +525,7 @@
/// <param name="deviceKey"></param>
private void GetHumidityValue(NormalViewControl btnHumi, string deviceKey)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
+ var device = Common.LocalDevice.Current.GetDevice(deviceKey);
if (device == null)
{
return;
@@ -569,14 +537,14 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
- string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null
|| report.DeviceStatusReport.CluterID != 1029)
{
return;
}
receiveData = true;
- var localDevice = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
+ var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
decimal humidity = (decimal)localDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);
@@ -599,7 +567,7 @@
{
//鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
System.Threading.Thread.Sleep(1500);
- var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
+ var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
if (result != null)
{
device.AttributeStatus.Clear();
@@ -619,8 +587,7 @@
&& data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
//澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
- decimal humidity = 0;
- this.AdjustHumidityValue(data.AttributeData, ref humidity);
+ decimal humidity = Common.LocalDevice.Current.AdjustHumidityValue(data.AttributeData);
device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });
device.ReSave();
@@ -638,30 +605,6 @@
}
}
});
- }
-
- /// <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