From dce6c3481a37216292724013ff9d2b75ceb82f86 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 15:47:28 +0800
Subject: [PATCH] 添加小度的代码

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 911745a..4798b97 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -385,6 +385,10 @@
                 {
                     listDevice.Add(device);
                 }
+                else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
+                {
+                    listDevice.Add(device);
+                }
             }
             var listSelect = new List<string>() { newRoom.HumidityDevice };
             var form = new SelectDeviceForm();
@@ -440,7 +444,8 @@
                     {
                         HdlThreadLogic.Current.RunMain(() =>
                         {
-                            if (data.AttriButeData == 0)
+                            decimal humidity = (decimal)device.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, device, null);
+                            if (humidity == 0)
                             {
                                 //0
                                 btnHumi.Text = "0.0%";
@@ -448,11 +453,8 @@
                             }
                             else
                             {
-                                //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
-                                string strValue = data.AttriButeData.ToString();
-                                strValue = strValue.Substring(0, strValue.Length - 1);
                                 //璁板綍婀垮害
-                                this.newRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                                this.newRoom.Humidity = humidity;
                                 btnHumi.Text = this.newRoom.Humidity.ToString() + "%";
                             }
                         });
@@ -460,7 +462,7 @@
                 }
             });
             //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
-            ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+            device.GetType().InvokeMember("ReadTemperatureOrHumidity", System.Reflection.BindingFlags.InvokeMethod, null, device, null);
         }
 
         #endregion

--
Gitblit v1.8.0