From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 3c693e5..6ab3291 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -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();
@@ -515,7 +515,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 +544,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 +557,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 +569,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 +599,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();

--
Gitblit v1.8.0