添加了写入功能类型

黄学彪

2020-07-01 304dca51c28183a9dfc192c6b93ea1c00bdd5d97

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

@@ -333,11 +333,28 @@
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);

            if (isShow == true)

            {

                //备注：面板中只显示真实的设备，其他属于绑定的回路不显示

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

                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 if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)

                {

                    var listTemp = Common.LocalDevice.Current.GetPanelMatchEpointByMac(listDevice);

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

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

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

@@ -497,6 +514,27 @@
                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

            }

            //简约环境面板的按键配置

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

            {



                if (device.Type == DeviceType.FreshAir || device.Type == DeviceType.Thermostat)

                {

                    var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();

                    form.AddForm(device);

                }

                else

                {

                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

            }

            //简约环境面板的按键配置

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

            {

                var form = new DeviceFunctionSettionForm();

                form.AddForm(device, true);

            }

            //方悦面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

@@ -1019,6 +1057,20 @@
                {

                    continue;

                }



                //获取设备类型的

                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });

                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)

                {

                    foreach (var outClu in device.OutClusterList)

                    {

                        //去掉简约环境面板类的各种服务端设备，室内机不显示

                        if (outClu.OutCluster == 513)

                        {

                            continue;

                        }

                    }

                }

                if (dic.ContainsKey(device.DeviceAddr) == false)

                {

                    dic[device.DeviceAddr] = new List<CommonDevice>();

@@ -1281,7 +1333,7 @@
        }

        #endregion



        #region ■ 自定义智能音箱控件_____________________

        #region ■ 自定义智能音箱控件_________________



        /// <summary>

        /// 自定义网关控件