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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

old mode 100755
new mode 100644
@@ -524,7 +524,51 @@
                        //已经接收到状态

                        locadevice.HadReadDeviceStatu = true;

                    }

                }
                #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



                #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

            }



@@ -620,7 +664,7 @@
        /// 设备在线状态更新反馈

        /// </summary>

        /// <param name="receiveData"></param>

        private void DeviceOnlineChangePush (JObject receiveData)

        private void DeviceOnlineChangePush(JObject receiveData)

        {

            if (this.dicDeviceEvent.Count == 0)

            {