新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

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

@@ -215,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);
@@ -256,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);
@@ -704,7 +712,7 @@
        }

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

        /// <summary>
        /// 是否是真实的新风设备 【部分是能绑定新风的设备】 
        /// 是否是真实的新风设备 【过滤server端】 
        /// </summary>
        /// <param name="device"></param>
        /// <returns></returns>
@@ -738,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>