From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）

---
 ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index c9d050e..2fc4517 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -72,8 +72,8 @@
 
         public override void RemoveFromParent()
         {
-            HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
-            HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
 
             base.RemoveFromParent();
         }
@@ -206,8 +206,8 @@
                     }
                     room.TemperatrueDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
 
-                    HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
-                    HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+                    HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+                    HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice",  ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
                     {
                         string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                         if (room.TemperatrueDevice != mainKeys)
@@ -215,7 +215,7 @@
                             return;
                         }
                         //绉婚櫎鎺変簨浠�
-                        HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+                        HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
 
                         foreach (var data in report.DeviceStatusReport.AttriBute)
                         {
@@ -251,8 +251,8 @@
 
             if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
             {
-                HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
-                HdlDeviceAttributeLogic.Current.AddAttributeEvent("TemperatrueDevice", "DeviceStatusReport", (Action<ZigBee.Device.CommonDevice>)((report) =>
+                HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+                HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice",  ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (Action<ZigBee.Device.CommonDevice>)((report) =>
                 {
                     string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                     if (room.TemperatrueDevice != mainKeys)
@@ -260,7 +260,7 @@
                         return;
                     }
                     //绉婚櫎鎺変簨浠�
-                    HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+                    HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
 
                     foreach (var data in report.DeviceStatusReport.AttriBute)
                     {
@@ -317,8 +317,8 @@
                     }
                     room.HumidityDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
 
-                    HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
-                    HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
+                    HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+                    HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice",  ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
                     {
                         string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                         if (room.HumidityDevice != mainKeys)
@@ -326,7 +326,7 @@
                             return;
                         }
                         //绉婚櫎鎺変簨浠�
-                        HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+                        HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
                         foreach (var data in report.DeviceStatusReport.AttriBute)
                         {
                             if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -352,8 +352,8 @@
             };
             if (string.IsNullOrEmpty(room.HumidityDevice) == false)
             {
-                HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
-                HdlDeviceAttributeLogic.Current.AddAttributeEvent("HumidityDevice", "DeviceStatusReport", (report) =>
+                HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
+                HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice",  ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
                 {
                     string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
                     if (room.HumidityDevice != mainKeys)
@@ -361,7 +361,7 @@
                         return;
                     }
                     //绉婚櫎鎺変簨浠�
-                    HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+                    HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
                     foreach (var data in report.DeviceStatusReport.AttriBute)
                     {
                         if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -396,7 +396,7 @@
             confirm.MouseUpEventHandler += (sender, e) =>
             {
                 var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
-                var fileName = $"Room_{tradeTime}";
+                var fileName = $"RoomIcon_{tradeTime}.png";
                 room.Name = nameRow.NameText.Text.Trim();
                 if (OldIconPathType != 1)
                 {
@@ -522,7 +522,7 @@
             {
                 selectFL.RemoveFromParent();
                 var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
-                var fileName = $"Room_{tradeTime}";
+                var fileName = $"RoomIcon_{tradeTime}.png";
                 //閫氳繃鐩告満鎷嶇収瑁佸壀
                 CropImage.TakePicture((imagePath) =>
                 {
@@ -543,7 +543,7 @@
             {
                 selectFL.RemoveFromParent();
                 var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
-                var fileName = $"Room_{tradeTime}";
+                var fileName = $"RoomIcon_{tradeTime}.png";
                 //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
                 CropImage.SelectPicture((imagePath) =>
                 {

--
Gitblit v1.8.0