新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs

@@ -260,15 +260,7 @@
                        {
                            continue;
                        }
                        if (string.IsNullOrEmpty(bDev.ESName))
                        {
                            bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                        }
                        else
                        {
                            bindAcName = bDev.ESName;
                        }

                        bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                        bindAcDev = device;
                    }
                    else if (device.Type == DeviceType.FreshAir)
@@ -280,15 +272,7 @@
                        {
                            continue;
                        }
                        if (string.IsNullOrEmpty(bDev.ESName))
                        {
                            bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                        }
                        else
                        {
                            bindFreshAirName = bDev.ESName;
                        }

                        bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                        bindFreshAirDev = device;
                    }
                    else if (device.Type == DeviceType.TemperatureSensor)
@@ -296,41 +280,18 @@
                        var bD = device as TemperatureSensor;
                        if (bD.SensorDiv == 1)
                        {
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindTemperatureName = bDev.ESName;
                            }
                            bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindTemperatureDev = device;
                        }
                        if (bD.SensorDiv == 2)
                        {
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindHumidityName = bDev.ESName;
                            }

                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindHumidityDev = device;
                        }
                    }
                    else if (device.Type == DeviceType.FreshAirHumiditySensor)
                    {
                        if (string.IsNullOrEmpty(bDev.ESName))
                        {
                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                        }
                        else
                        {
                            bindHumidityName = bDev.ESName;
                        }

                        bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                        bindHumidityDev = device;
                    }
                    else if (device.Type == DeviceType.PMSensor)
@@ -347,15 +308,7 @@
                        }
                        if (bDev.BindCluster == 1066)
                        {
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindPmName = bDev.ESName;
                            }

                            bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindPMDev = device;
                        }
                    }
@@ -406,15 +359,7 @@
                            {
                                continue;
                            }
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindAcName = bDev.ESName;
                            }

                            bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindAcDev = device;
                        }
                        else if (device.Type == DeviceType.FreshAir)
@@ -426,15 +371,7 @@
                            {
                                continue;
                            }
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindFreshAirName = bDev.ESName;
                            }

                            bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindFreshAirDev = device;
                        }
                        else if (device.Type == DeviceType.TemperatureSensor)
@@ -442,54 +379,23 @@
                            var bD = device as TemperatureSensor;
                            if (bD.SensorDiv == 1)
                            {
                                if (string.IsNullOrEmpty(bDev.ESName))
                                {
                                    bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                                }
                                else
                                {
                                    bindTemperatureName = bDev.ESName;
                                }
                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                                bindTemperatureDev = device;
                            }
                            if (bD.SensorDiv == 2)
                            {
                                if (string.IsNullOrEmpty(bDev.ESName))
                                {
                                    bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                                }
                                else
                                {
                                    bindHumidityName = bDev.ESName;
                                }

                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                                bindHumidityDev = device;
                            }
                        }
                        else if (device.Type == DeviceType.FreshAirHumiditySensor)
                        {
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindHumidityName = bDev.ESName;
                            }

                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindHumidityDev = device;
                        }
                        else if (device.Type == DeviceType.Thermostat)
                        {
                            if (string.IsNullOrEmpty(bDev.ESName))
                            {
                                bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            }
                            else
                            {
                                bindAcName = bDev.ESName;
                            }

                            bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                            bindAcDev = device;
                        }
                        else if (device.Type == DeviceType.PMSensor)