新版本

黄学彪

2020-07-13 f3e65daca7978b21b5888f49b1bf35e1a6e5d4fd

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs

@@ -274,10 +274,10 @@
        }

        /// <summary>
        /// 获取楼层对应的房间列表
        /// 获取支持的房间列表
        /// </summary>
        /// <returns></returns>
        public static List<Room> GetFloorRoomList()
        public static List<Room> GetSupportRoomList()
        {
            var supportRoomListTemp = new List<Room>();
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
@@ -347,10 +347,7 @@
                                var device = LocalDevice.Current.GetDevice(de);
                                if (device != null)
                                {
                                    //获取设备类型的
                                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                                    //新风面板的新风设备，则不显示
                                    if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
                                    if (BindInfo.checkRealFreshAirDevice(device) == false)
                                    {
                                        continue;
                                    }
@@ -711,7 +708,7 @@
        {
            bool result = true;
            //获取设备类型的
            var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 513);
            var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 513 || obj.OutCluster == 514);
            if (clu != null)
            {
                result = false;