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

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -496,6 +496,11 @@
                    {

                        cardContr = new Controls.DeviceCurtainRowControl();

                    }

                    //晾衣架 Airer

                    if (device.Type == DeviceType.Airer)

                    {

                        cardContr = new Controls.DeviceAirerRowControl();

                    }

                    //继电器

                    else if (device.Type == DeviceType.OnOffOutput)

                    {

@@ -520,6 +525,17 @@
                    else if (device.Type == DeviceType.PMSensor)

                    {

                        cardContr = new Controls.DevicePmSensorRowControl();

                    }

                    // 空气质量传感器

                    else if (device.Type == DeviceType.TemperatureSensor)

                    {

                        //获取设备类型

                        var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });

                        //空气质量传感器

                        if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)

                        {

                            cardContr = new Controls.DeviceAirQualitySensorRowControl();

                        }

                    }

                    //彩灯(调光器)

                    else if (device.Type == DeviceType.DimmableLight)

@@ -843,6 +859,13 @@
                {

                    //处理一般设备的上报数据

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);

                    //晾衣架上报需要特殊处理，其他上报的回路统一转为端点1

                    var tempList = LocalDevice.Current.GetDevicesByMac(report.DeviceAddr);

                    var tempDeviceEnum = LocalDevice.Current.GetMyDeviceEnumInfo(tempList);

                    if (tempDeviceEnum.ConcreteType == Common.DeviceConcreteType.Airer)

                    {

                        mainKeys = report.DeviceAddr + "_" + 1;

                    }

                    if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)

                    {

                        //刷新卡片信息