From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 3f81650..d766728 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -548,6 +548,28 @@
}
#endregion
+
+ #region 鈻� PM2.5鏁版嵁
+ //PM2.5鏁版嵁
+ else if (report.DeviceStatusReport.CluterID == 1066)
+ {
+ foreach (var attData in report.DeviceStatusReport.AttriBute)
+ {
+ //PM2.5
+ if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
+ {
+
+ if (attData.AttriButeDataType == 57)
+ {
+ ((PMSensor)locadevice).currentPmData = attData.AttriButeData;
+ }
+ }
+ //宸茬粡鎺ユ敹鍒扮姸鎬�
+ locadevice.HadReadDeviceStatu = true;
+ }
+ }
+
+ #endregion
}
this.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
@@ -619,7 +641,7 @@
{
//娓╁眳鍩庣殑瑕佺綉鍏充腑鏄惁鏈夐�昏緫瀛樺湪
//鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�
- var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+ var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device);
HdlThreadLogic.Current.RunMain(() =>
{
//寮瑰嚭寰愭鐨勯偅涓獥鍙�
--
Gitblit v1.8.0