2020-4-29-1

陈嘉乐

2020-04-29 38ab16c66df6fc523f2c385fd583a2f2e86a781c

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -438,8 +438,8 @@
            var noFunction = new Button()

            {

                Y = Application.GetRealHeight(320),

                Width = Application.GetMinRealAverage(757),

                Height = Application.GetMinRealAverage(435),

                Width = this.GetPictrueRealSize(757),

                Height = this.GetPictrueRealSize(435),

                UnSelectedImagePath = "Item/NoFunction.png",

                Gravity = Gravity.CenterHorizontal

            };

@@ -522,6 +522,11 @@
                    else if (device.Type == DeviceType.Thermostat)

                    {

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

                    }

                    // 新风

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

                    {

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

                    }

                    //彩灯(调光器)

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

@@ -761,8 +766,8 @@
            var noFunction = new Button()

            {

                Y = Application.GetRealHeight(320),

                Width = Application.GetMinRealAverage(757),

                Height = Application.GetMinRealAverage(435),

                Width = this.GetPictrueRealSize(757),

                Height = this.GetPictrueRealSize(435),

                UnSelectedImagePath = "Item/NoFunction.png",

                Gravity = Gravity.CenterHorizontal

            };

@@ -806,6 +811,11 @@
                        if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)

                        {

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

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

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

                        {

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

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

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

@@ -914,6 +924,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));