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/AddNewRoomForm.cs | 83 ++++++-----------------------------------
1 files changed, 13 insertions(+), 70 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 753bf16..e61460f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -197,7 +197,7 @@
Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
newRoom.BackgroundImage = picName;
//澶囦唤
- HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(picName);
+ Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);
}
newRoom.FloorId = this.floorKeys;
@@ -259,7 +259,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)
@@ -283,7 +283,7 @@
btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- newRoom.TemperatrueDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
+ newRoom.TemperatrueDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇娓╁害鍊�
this.GetTemperatrueValue(btnTemper, newRoom.TemperatrueDevice);
};
@@ -296,7 +296,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;
@@ -308,7 +308,7 @@
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 (newRoom.TemperatrueDevice != mainKeys || btnTemper == null
|| report.DeviceStatusReport.CluterID != 1026)
{
@@ -339,7 +339,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();
@@ -358,8 +358,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();
@@ -379,37 +378,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 鈻� 婀垮害浼犳劅鍣ㄧ浉鍏砡____________________
@@ -421,7 +389,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)
@@ -450,7 +418,7 @@
btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- newRoom.HumidityDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
+ newRoom.HumidityDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇婀垮害鍊�
this.GetHumidityValue(btnHumi, newRoom.HumidityDevice);
};
@@ -463,7 +431,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;
@@ -475,7 +443,7 @@
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 (newRoom.HumidityDevice != mainKeys || btnHumi == null
|| report.DeviceStatusReport.CluterID != 1029)
{
@@ -504,7 +472,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();
@@ -524,8 +492,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();
@@ -543,30 +510,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