~xm/HomeApp.git

			@@ -41,6 +41,10 @@
			/// 地暖目标
			/// </summary>
			Fh = 6,
			/// <summary>
			/// 地CO2暖目标
			/// </summary>
			CO2 = 7,
			}

			#endregion
			@@ -171,6 +175,17 @@
			{
			curRoomDeviceListTemp.Add(device);
			}

			if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			curRoomDeviceListTemp.Add(device);
			}
			}
			}
			}
			break;
			@@ -187,6 +202,25 @@
			continue;
			}
			curRoomDeviceListTemp.Add(device);
			}
			}
			}
			break;
			case BindType.CO2:
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			curRoomDeviceListTemp.Add(device);
			}
			}
			}
			}
			@@ -265,6 +299,14 @@
			continue;
			}
			if (dev.SensorDiv == 2)
			{
			roomIncludeMatchHumpDevice.Add(device);
			}

			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			roomIncludeMatchHumpDevice.Add(device);
			}
			@@ -397,6 +439,16 @@
			{
			roomIncludeMatchDevice.Add(device);
			}
			else if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			roomIncludeMatchDevice.Add(device);
			}
			}
			}
			}
			break;
			@@ -417,6 +469,25 @@
			}
			}
			break;
			case BindType.CO2:
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			if (device != null)
			{
			if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			roomIncludeMatchDevice.Add(device);
			}
			}
			}
			}
			break;
			}

			if (roomIncludeMatchDevice.Count == 0)
			@@ -426,7 +497,7 @@

			if (!string.IsNullOrEmpty(room.FloorId))
			{
			//有楼层
			//有楼层[控制面板如果不在房间，默认不绑定]
			if (room.FloorId == curControlDev.currentSelectFloorId)
			{
			roomTempList.Add(room);
			@@ -520,6 +591,14 @@
			{
			undistruibuteDevList.Add(device);
			}

			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			undistruibuteDevList.Add(device);
			}
			}
			else if (device.Type == DeviceType.PMSensor)
			{
			@@ -545,6 +624,16 @@
			{
			undistruibuteDevList.Add(device);
			}
			else if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			undistruibuteDevList.Add(device);
			}
			}
			}
			break;
			case BindType.AC:
			@@ -557,6 +646,21 @@
			continue;
			}
			undistruibuteDevList.Add(device);
			}
			}
			break;
			case BindType.CO2:
			foreach (var device in UndistributeCommonDeviceListTemp)
			{
			if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			undistruibuteDevList.Add(device);
			}
			}
			}
			break;
			@@ -654,6 +758,17 @@
			{
			currentPanelBindSupportDeviceListTemp.Add(device);
			}

			if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			currentPanelBindSupportDeviceListTemp.Add(device);
			}
			}
			}
			}
			}
			@@ -677,6 +792,32 @@
			continue;
			}
			currentPanelBindSupportDeviceListTemp.Add(device);
			}
			}
			}
			}
			break;
			case BindType.CO2:
			foreach (var r in supportRoomList)
			{
			if (r.ListDevice.Count == 0)
			{
			continue;
			}
			foreach (var deviceKeys in r.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
			{
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			currentPanelBindSupportDeviceListTemp.Add(device);
			}
			}
			}
			}
			@@ -1077,6 +1218,6 @@
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			}
			#endregion
			#endregion
			}
			}