Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 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(() =>

                            {

                                //弹出徐梅的那个窗口