新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

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

@@ -37,6 +37,10 @@
            /// 空调目标
            /// </summary>
            AC = 5,
            /// <summary>
            /// 地暖目标
            /// </summary>
            Fh = 6,
        }

        #endregion
@@ -211,6 +215,10 @@
                    if (device.Type == DeviceType.TemperatureSensor)
                    {
                        var dev = device as TemperatureSensor;
                        if (BindInfo.checkRealTemperatureDevice(device) == false)
                        {
                            continue;
                        }
                        if (dev.SensorDiv == 1)
                        {
                            roomIncludeMatchTempDevice.Add(device);
@@ -252,6 +260,10 @@
                    if (device.Type == DeviceType.TemperatureSensor)
                    {
                        var dev = device as TemperatureSensor;
                        if (BindInfo.checkRealTemperatureDevice(device) == false)
                        {
                            continue;
                        }
                        if (dev.SensorDiv == 2)
                        {
                            roomIncludeMatchHumpDevice.Add(device);
@@ -274,10 +286,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 +359,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;
                                    }
@@ -703,7 +712,7 @@
        }

        /// <summary>
        /// 是否是真实的空调设备 【部分是能绑定空调的设备】 
        /// 是否是真实的空调设备 【过滤server端】 
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>
@@ -711,7 +720,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;
@@ -720,7 +729,7 @@
        }

        /// <summary>
        /// 是否是真实的新风设备 【部分是能绑定新风的设备】 
        /// 是否是真实的新风设备 【过滤server端】 
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>
@@ -728,12 +737,8 @@
        {
            bool result = true;
            //获取设备类型的
            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
            {
                result = false;
            }
            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
            var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 514);
            if (clu != null)
            {
                result = false;
            }
@@ -741,7 +746,28 @@
        }

        /// <summary>
        /// 检测该设备能否显示
        /// 是否是真实的温度设备 【过滤server端】 
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>
        public static bool checkRealTemperatureDevice(CommonDevice device)
        {
            bool result = true;
            //获取设备属于【简约多功能面板】
            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
            {
                if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
                {
                    //简约多功能面板第1回路是一个绑定温湿度传感器第类型，不是真的温湿度的传感器，需要屏蔽掉
                    result = false;
                }
            }
            return result;
        }

        /// <summary>
        /// 检测该设备能否显示【过滤server端】 
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>