发布的1.0.20052901

xm

2020-05-29 ca233e3c6154859a17948d892fbc6bbf723b60a8

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

@@ -316,20 +316,38 @@
            int heightValue = ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace;

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);

            if (isShow == true)

            {

                //展开模式时，扩大依据为:它有几个子控件

                heightValue = (listDevice.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);

                //标题自己就是一个子控件

                if (rowInfo.frameTable.ChildrenCount == 1)

                {

                    //获取这一堆设备时属于什么类型的

                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);

                    foreach (CommonDevice info in listDevice)

                    {

                        //加载它的列表

                        this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);

            {
                //获取这一堆设备时属于什么类型的
                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                {
                    var listTemp = Common.LocalDevice.Current.GetMutilfunctionPanelByMac(listDevice);
                    //展开模式时，扩大依据为:它有几个子控件
                    heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
                    //标题自己就是一个子控件
                    if (rowInfo.frameTable.ChildrenCount == 1)
                    {
                        foreach (CommonDevice info in listTemp)
                        {
                            //加载它的列表
                            this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
                        }
                    }
                }
                else
                {
                    //展开模式时，扩大依据为:它有几个子控件
                    heightValue = (listDevice.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
                    //标题自己就是一个子控件
                    if (rowInfo.frameTable.ChildrenCount == 1)
                    {
                        foreach (CommonDevice info in listDevice)
                        {
                            //加载它的列表
                            this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
                        }
                    }

                }

                }
            }

            //自身高度变更

            rowInfo.frameTable.Height = heightValue;

@@ -447,8 +465,8 @@
            {

                var form = new DeviceFunctionSettionForm();

                form.AddForm(device, true);

            }

            //新风面板

            }
            //新风面板
            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {

                //方悦新风面板的按键配置

@@ -464,6 +482,7 @@
                    form.AddForm(device, true);

                }

            }



            //方悦面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour