From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index b6ddfc2..920a4ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -306,16 +306,16 @@
if (changedFloor == false)
{
//鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎸囧畾鎴块棿鐨勪俊鎭�
- MainPage.ListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
+ MainPage.LeftListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
}
else
{
//鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎴块棿鍒楄〃淇℃伅
- MainPage.ListRoomViewFrom.Instance.RefreshListRoom();
+ MainPage.LeftListRoomViewFrom.Instance.RefreshListRoom();
}
//绠椾簡,杩欓噷濡傛灉鎸変笅淇濆瓨,鍒欎富椤甸渶瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
this.CloseForm();
};
@@ -372,6 +372,11 @@
{
//鑾峰彇娓╁害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
{
listDevice.Add(device);
}
@@ -463,6 +468,16 @@
{
listDevice.Add(device);
}
+ //鏂伴
+ else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
+ {
+ listDevice.Add(device);
+ }
}
var listSelect = new List<string>() { cloneRoom.HumidityDevice };
var form = new SelectDeviceForm();
@@ -515,7 +530,8 @@
var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
- if (((ZigBee.Device.TemperatureSensor)localDevice).Humidity == 0)
+ decimal humidity = (decimal)localDevice.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);
+ if (humidity == 0)
{
//0
btnHumi.Text = "0.0%";
@@ -524,13 +540,13 @@
else
{
//璁板綍婀垮害
- this.cloneRoom.Humidity = ((ZigBee.Device.TemperatureSensor)localDevice).Humidity;
+ this.cloneRoom.Humidity = humidity;
btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";
}
}, ShowErrorMode.NO);
});
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ device.GetType().InvokeMember("ReadTemperatureOrHumidity", System.Reflection.BindingFlags.InvokeMethod, null, device, null);
}
#endregion
--
Gitblit v1.8.0