新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

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

@@ -831,14 +831,19 @@
                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();

                    form.AddForm(listNewDevice[0], deviceEnumInfo);

                }

                //简约环境面板的按键配置

                //简约多功能面板的按键配置

                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

                {

                    var form = new DeviceFunctionSettionForm();

                    if (listNewDevice.Count > 62)

                    foreach (var dev in listNewDevice)

                    {

                        form.AddForm(listNewDevice[62], true);

                        if (dev.Type == DeviceType.OnOffOutput && dev.DeviceEpoint == 62)

                        {

                            var form = new DeviceFunctionSettionForm();

                            form.AddForm(dev, true);

                            break;

                        }

                    }



                }

                //河东的面板设备

                else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)

@@ -1313,41 +1318,18 @@
                        var bD = device as TemperatureSensor;

                        if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)

                        {

                            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 && bDev.BindCluster == 1029)

                        {

                            if (string.IsNullOrEmpty(bDev.ESName))

                            {

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

                            }

                            else

                            {

                                bindHumidityName = bDev.ESName;

                            }



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

                            bindHumidityDev = device;

                        }

                    }

                    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;

                    }

                }

@@ -1683,7 +1665,7 @@
                frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>

                {

                    //发送定位功能

                    Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0]);

                    Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0], true);

                });

            }