上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -427,6 +427,18 @@
                    //只要同一种类型的

                    continue;

                }



                //获取设备属于【简约多功能面板】

                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);

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

                {

                    if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)

                    {

                        //简约多功能面板第1回路是一个绑定温湿度传感器第类型，不是真的温湿度的传感器，需要屏蔽掉

                        continue;

                    }

                }



                listRelay.Add(device);

                if (device.DeviceEpoint == deviceObj.DeviceEpoint)

                {

@@ -467,7 +479,6 @@
            }

            return listIcon;

        }



        #endregion



        #region ■ 回路选择___________________________