2021-10-27-01

温居城

2021-10-27 993ecf49ae04ccea89f6bc4a32cfc0c45def1215

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -784,10 +784,11 @@
            //只有回路数大于1才能有这个菜单

            if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)

            {

                //新风小模块只有一个回路，但要求新风小模块的新风有功能设置

                //空气质量传感器和新风小模块只有一个回路，但要求新风小模块的新风有功能设置

                //晾衣架默认只存储第一回路，其他回路被过滤了

                bool isSpecial = false;

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul ||

                    deviceEnumInfo.ConcreteType == DeviceConcreteType.AirQualitySensor)

                {

                    isSpecial = true;

                }

@@ -1200,6 +1201,7 @@
                        if (string.IsNullOrEmpty(bindName))

                        {

                            btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);

                            bindHumidityDev = null;

                        }

                        else

                        {

@@ -1251,6 +1253,7 @@
                        if (string.IsNullOrEmpty(bindName))

                        {

                            btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);

                            bindTemperatureDev = null;

                        }

                        else

                        {

@@ -1334,6 +1337,8 @@
                    {

                        continue;

                    }

                    //获取设备类型的

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

                    if (device.Type == DeviceType.TemperatureSensor)

                    {

                        var bD = device as TemperatureSensor;

@@ -1347,11 +1352,39 @@
                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);

                            bindHumidityDev = device;

                        }



                        //空气质量传感器

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

                        {

                            if (bDev.BindCluster == 1026)

                            {

                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);

                                bindTemperatureDev = device;

                            }

                            if (bDev.BindCluster == 1029)

                            {

                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);

                                bindHumidityDev = device;

                            }

                        }

                    }

                    if (device.Type == DeviceType.FreshAirHumiditySensor)

                    {

                        bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);

                        bindHumidityDev = device;

                    }

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

                    {

                        if (bDev.BindCluster == 1026)

                        {

                            bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);

                            bindTemperatureDev = device;

                        }

                        if (bDev.BindCluster == 1029)

                        {

                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);

                            bindHumidityDev = device;

                        }

                    }

                }

                result = true;

@@ -1602,7 +1635,7 @@
                        }

                    }, ShowErrorMode.NO);

                }

            });

            }, ShowErrorMode.NO);

        }



        #endregion