合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

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

@@ -411,6 +411,37 @@
                var form = new DeviceAirConditioner.IndoorUnitSettionForm();

                form.AddForm((AC)device);

            }

            //环境面板

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

            {

                var form = new DeviceFunctionSettionForm();

                form.AddForm(device, true);

            }

            //方悦面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

            {

                //干接点

                if (device.Type == DeviceType.OnOffSwitch)

                {

                    //方悦面板的按键配置

                    var form = new DevicePanel.PanelFangyueButtonSettionForm();

                    form.AddForm(device);

                }

                //继电器

                else if (device.Type == DeviceType.OnOffOutput)

                {

                    //方悦面板的功能配置

                    var form = new DevicePanel.PanelFangyueButtonSettionForm();

                    form.AddForm(device);

                }

                else

                {

                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

            }

            //面板设备

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

            {

@@ -443,12 +474,6 @@
                        var form = new DeviceFunctionSettionForm();

                        form.AddForm(device, true);

                    }

                }

                //温湿度

                else if (device.Type == DeviceType.TemperatureSensor)

                {

                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

                else

                {

@@ -914,8 +939,9 @@
            if (this.nowActionDeviceMac != null)

            {

                var rowInfo = this.dicRowInfo[nowActionDeviceMac];

                //检测这个设备是否被删除

                if (Common.LocalDevice.Current.GetDevicesByMac(nowActionDeviceMac).Count == 0)

                //检测这个设备是否被删除 2020.01.13变更:追加Ota设备的判断

                if (Common.LocalDevice.Current.GetDevicesByMac(nowActionDeviceMac).Count == 0

                    && Common.LocalDevice.Current.GetOTADevice(nowActionDeviceMac) == null)

                {

                    //移除控件

                    rowInfo.dicDetailRow = null;