合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

@@ -396,8 +396,17 @@
            //pir传感器

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

            {

                var form = new DevicePirSensor.PirSensorBindTargetSettionForm();

                form.AddForm((IASZone)device);

                if (device is IASZone)

                {

                    var form = new DevicePirSensor.PirSensorBindTargetSettionForm();

                    form.AddForm((IASZone)device);

                }

                else

                {

                    //pir传感器,他们又搞了个继电器在里面

                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

            }

            //中央空调

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