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

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -630,6 +630,11 @@
                    {

                        cardContr = new Controls.DevicePmSensorCardControl();

                    }

                    // 晾衣架 
                    else if (device.Type == DeviceType.Airer)

                    {

                        cardContr = new Controls.DeviceAirerCardControl();

                    }

                    //彩灯(调光器)

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

                    {

@@ -643,7 +648,18 @@
                    //温湿度

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

                    {

                        cardContr = new Controls.DeviceTemperatureCardControl();

                        //空气质量传感器 
                        //获取设备类型

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

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

                        {

                            cardContr = new Controls.DeviceAirQualitySensorCardControl();

                        }

                        else

                        {

                            cardContr = new Controls.DeviceTemperatureCardControl();



                        }

                    }

                    //门锁

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

@@ -1121,6 +1137,15 @@
                {

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

                    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.dicDeviceCardControl.ContainsKey(mainKeys) == true)

                    {

                        //刷新卡片信息