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/ZigBee/Device/ZbGateway.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 7c8edec..8a07d57 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -3229,6 +3229,20 @@
//2020.05.11 鍒犻櫎
#endregion
+
+ #region 璁惧鐘舵�佷笂鎶�
+ if (topic == gatewayID + "/" + "DeviceStatusReport" + "/" + addr + "/" + epoint + "/" + cluID + "/" + attrId)
+ {
+ var deviceID = jobject.Value<int>("Device_ID");
+ var deviceAddr = jobject.Value<string>("DeviceAddr");
+ var tempEpoint = jobject.Value<int>("Epoint");
+ var dataId = jobject.Value<int>("Data_ID");
+
+ var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint };
+ tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(jobject["Data"].ToString());
+ UpdateDeviceInfo(tempDevice, "DeviceStatusReport");
+ }
+ #endregion
#region 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
else if (topic == gatewayID + "/" + "DoorLock/DoorLockOperatingEventNotificationCommand")
{
--
Gitblit v1.8.0