合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs

@@ -359,6 +359,20 @@
                            //已经接收到状态
                            locadevice.HadReadDeviceStatu = true;
                        }

                        if (locadevice is TemperatureSensor)
                        {
                            //获取设备类型
                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { locadevice });
                            //空气质量传感器
                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                            {
                                locadevice.DeviceStatusReport = report.DeviceStatusReport;
                                ((TemperatureSensor)locadevice).OnOffStatus = report.DeviceStatusReport.AttriBute[0].AttriButeData;
                                //已经接收到状态
                                locadevice.HadReadDeviceStatu = true;
                            }
                        }
                    }
                }
                #endregion
@@ -735,10 +749,19 @@
                        //PM2.5
                        if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
                        {

                            if (attData.AttriButeDataType == 57)
                            {
                                ((PMSensor)locadevice).currentPmData = attData.AttriButeData;
                                //获取设备类型
                                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { locadevice });
                                //空气质量传感器
                                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                                {
                                    ((TemperatureSensor)locadevice).currentPmData = attData.AttriButeData;
                                }
                                else
                                {
                                    ((PMSensor)locadevice).currentPmData = attData.AttriButeData;
                                }
                            }
                        }
                        //已经接收到状态
@@ -748,6 +771,30 @@

                #endregion

                #region ■ CO2数据
                else if (report.DeviceStatusReport.CluterID == 1037)
                {
                    foreach (var attData in report.DeviceStatusReport.AttriBute)
                    {
                        if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
                        {
                            if (attData.AttriButeDataType == 57)
                            {
                                //获取设备类型
                                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { locadevice });
                                //空气质量传感器
                                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                                {
                                    ((TemperatureSensor)locadevice).currentCO2 = attData.AttriButeData;
                                }
                            }
                        }
                        //已经接收到状态
                        locadevice.HadReadDeviceStatu = true;
                    }
                }
                #endregion

                #region ■ 设备基础信息

                else if (report.DeviceStatusReport.CluterID == 0)