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

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

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

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

                        {

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

                            bindHumidityDev = null;

                        }

                        else

                        {

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

                        {

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

                            bindTemperatureDev = null;

                        }

                        else

                        {

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

                        continue;

                    }

                    //获取设备类型的

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

                    if (device.Type == DeviceType.TemperatureSensor)

                    {

                        var bD = device as TemperatureSensor;

@@ -1348,12 +1352,40 @@
                            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;

            }