From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13

---
 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 667f29f..e024c63 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -18,8 +18,8 @@
 
         public override void RemoveFromParent()
         {
-            HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
-            HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
+            HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
             base.RemoveFromParent();
         }
 
@@ -103,7 +103,7 @@
             var temperatureText = new Button
             {
                 X = Application.GetRealWidth(69),
-                Width = Application.GetRealWidth(86),
+                Width = Application.GetRealWidth(100),
                 Height = Application.GetRealHeight(58),
                 Gravity = Gravity.CenterVertical,
                 Text = "26鈩�"
@@ -133,8 +133,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)
@@ -142,7 +142,7 @@
                         return;
                     }
                     //绉婚櫎鎺変簨浠�
-                    HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
+                    HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
 
                     foreach (var data in report.DeviceStatusReport.AttriBute)
                     {
@@ -181,8 +181,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)
@@ -190,7 +190,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)

--
Gitblit v1.8.0