请合并新代码，更改多功能面板绑定表重复问题

xm

2020-08-14 a45fe56aeeac8f28a9891b83362954067c8166dc

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

@@ -251,6 +251,51 @@
                }

                #endregion



                #region ■ 电量推送

                //电量推送

                if (report.DeviceStatusReport.CluterID == 1)

                {

                    foreach (var attData in report.DeviceStatusReport.AttriBute)

                    {

                        //电量

                        if (attData.AttributeId == 33)

                        {

                            string receiptData = string.Empty;

                            //两个两个位置替换

                            for (int i = attData.AttriButeDataHex.Length - 1; i >= 0; i = i - 2)

                            {

                                receiptData += attData.AttriButeDataHex[i - 1].ToString() + attData.AttriButeDataHex[i].ToString();

                            }

                            int batteryValue = Convert.ToInt32(receiptData, 16);

                            //低于20%,则代表电量低

                            locadevice.IsBatteryDown = batteryValue < 20;

                        }

                        //已经接收到状态

                        locadevice.HadReadDeviceStatu = true;

                    }

                }



                #endregion



                #region ■ 蜂鸣器推送

                //蜂鸣器数据

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

                {

                    //mini夜灯

                    if (Common.LocalDevice.Current.IsMiniLight(locadevice) == true)

                    {

                        foreach (var attData in report.DeviceStatusReport.AttriBute)

                        {

                            if (attData.AttributeId == 0)

                            {

                                //这个是报警持续时间(大于2秒时,标记为还在响着)

                                ((ColorTemperatureLight)locadevice).IsBuzzerRing = attData.AttriButeData > 2 ? true : false;

                            }

                        }

                    }

                }

                #endregion



                #region ■ 窗帘数据

                //窗帘数据

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

@@ -420,6 +465,12 @@
                        }

                        //已经接收到状态

                        locadevice.HadReadDeviceStatu = true;



                        if (locadevice is LightBase)

                        {

                            //当接收到亮度值时,默认打开

                            ((LightBase)locadevice).OnOffStatus = 1;

                        }

                    }

                }

                #endregion

@@ -491,7 +542,7 @@
                            //温度传感器

                            if (locadevice is TemperatureSensor)

                            {

                                ((TemperatureSensor)locadevice).Temperatrue = temperatrue;

                                ((TemperatureSensor)locadevice).currentTemperature = temperatrue;

                            }

                            //PM2.5传感器

                            else if (locadevice is PMSensor)

@@ -500,6 +551,8 @@
                            }

                            //已经接收到状态

                            locadevice.HadReadDeviceStatu = true;

                            //温度值需要保存

                            locadevice.ReSave();

                        }

                    }

                }

@@ -540,21 +593,23 @@
                            //湿度传感器

                            if (locadevice is TemperatureSensor)

                            {

                                ((TemperatureSensor)locadevice).Humidity = humidity;

                                ((TemperatureSensor)locadevice).currentHumidity = humidity;

                            }

                            //新风的湿度传感器

                            else if (locadevice is HumiditySensor)

                            {

                                ((HumiditySensor)locadevice).Humidity = humidity;

                                ((HumiditySensor)locadevice).currentHumidity = humidity;

                            }

                            //PM2.5传感器

                            else if (locadevice is PMSensor)

                            {

                                ((PMSensor)locadevice).currentHumidity = (int)humidity;

                            }

                            //已经接收到状态

                            locadevice.HadReadDeviceStatu = true;

                            //湿度值需要保存

                            locadevice.ReSave();

                        }

                        //已经接收到状态

                        locadevice.HadReadDeviceStatu = true;

                    }

                }

                #endregion