From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 753bf16..d7b0a71 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();
@@ -421,7 +421,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 +450,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 +463,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 +475,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 +504,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