合并新代码，提供逻辑需要的门锁接口

xm

2020-04-28 dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -525,8 +525,8 @@
                    }

                    // 新风

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

                    {

                        cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);

                    {
                        cardContr = new Controls.DeviceFreshAirRowControl(listView.rowSpace / 2);
                    }

                    //彩灯(调光器)

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

@@ -780,6 +780,11 @@
                            //空调是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)

                        {

                            //新风是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);

                    }

                }, ShowErrorMode.NO);

@@ -886,6 +891,11 @@
                    LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                    dic[typeInfo.BeloneTextId].IconPathSelected = path2;

                    if (device.Type == DeviceType.FreshAir)
                    {
                        dic[typeInfo.BeloneTextId].IconPath = "Device/FreshAirEpoint.png";
                        dic[typeInfo.BeloneTextId].IconPathSelected = "Device/FreshAirEpointSelected.png";
                    }

                    dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;

                }

                dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));