合并新代码

xm

2020-04-15 bff8993501334c4f3c5f902216fe03253be747f8

 ZigbeeApp20200414/Shared/Phone/Category/CategoryMainForm.cs

old mode 100644
new mode 100755
@@ -514,11 +514,6 @@
                    {

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

                    }

                    //新风

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

                    //{

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

                    //}

                    //彩灯(调光器)

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

                    {