发布的1.0.20052901

xm

2020-05-29 ca233e3c6154859a17948d892fbc6bbf723b60a8

 ZigbeeApp20200525/Shared/Common/Device.cs

@@ -978,6 +978,47 @@
            return list;

        }



        /// <summary>
        /// 根据MAC地址,获取简约面板全部回路的设备对象
        /// </summary>
        /// <param name="listDevice"></param>
        /// <returns></returns>

        public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
        {
            //和彪哥、设备和产品部同事确认：
            //简约多功能面板[不显示多余的回路，只显示携带的2个继电器和1个温湿度传感器
            var list = new List<CommonDevice>();
            foreach (var dev in listDevice)
            {
                if (dev.Type == DeviceType.TemperatureSensor)
                {
                    if (dev.DeviceEpoint == 64)
                    {
                        list.Add(dev);
                    }
                }
                else if (dev.Type == DeviceType.OnOffOutput)
                {
                    list.Add(dev);
                }
            }

            if (sort == false)

            {

                return list;

            }
            list.Sort((obj1, obj2) =>
            {
                if (obj1.DeviceEpoint > obj2.DeviceEpoint)
                {
                    return 1;
                }
                return -1;
            });

            return list;
        }



        /// <summary>

        /// 根据MAC地址,获取全部回路的设备对象(强制排序)

        /// </summary>

@@ -2872,7 +2913,9 @@
            this.dicDeviceModelIdEnum["MPFA/TILE-ZB.18"] = "250-200-60003";//方悦新风面板

            this.dicDeviceModelIdEnum["MPTE3/TILE-ZB.18"] = "253-200-60003";//方悦环境面板

            this.dicDeviceModelIdEnum["MP2W/TILE-ZB.18"] = "256-200-60003";//窗帘面板
            this.dicDeviceModelIdEnum["MPTL4C/S-ZB.18"] = "212-200-60003";//简约多功能面板  
            this.dicDeviceModelIdEnum["MPTL4C/S-ZB.18"] = "212-200-60003";//简约多功能面板

            this.dicDeviceModelIdEnum["MPTE3/S-ZB.18"] = "230-200-60003";//简约环境面板





            //=========★★PIR传感器类(1200-1299)★★=========

            this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200-60000";//pir传感器220

@@ -3051,7 +3094,10 @@
        /// 简约多功能面板 镜像ID：212
        /// </summary>

        ButtonPanel_SimpleMultifunction = 212,



        /// <summary>
        /// 简约环境面板
        /// </summary>

        ButtonPanel_SimpleEnvironment = 230,

        //=========★★PIR传感器类(1200-1299)★★=========

        /// <summary>

        /// 传感器