~xm/HomeApp.git

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

			#endregion
			@@ -167,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;
			@@ -183,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);
			}
			}
			}
			}
			@@ -211,6 +249,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,7 +294,19 @@
			if (device.Type == DeviceType.TemperatureSensor)
			{
			var dev = device as TemperatureSensor;
			if (BindInfo.checkRealTemperatureDevice(device) == false)
			{
			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);
			}
			@@ -274,10 +328,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 +401,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;
			}
			@@ -388,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;
			@@ -408,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)
			@@ -417,7 +497,7 @@

			if (!string.IsNullOrEmpty(room.FloorId))
			{
			//有楼层
			//有楼层[控制面板如果不在房间，默认不绑定]
			if (room.FloorId == curControlDev.currentSelectFloorId)
			{
			roomTempList.Add(room);
			@@ -511,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)
			{
			@@ -536,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:
			@@ -548,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;
			@@ -645,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);
			}
			}
			}
			}
			}
			@@ -668,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);
			}
			}
			}
			}
			@@ -703,7 +853,7 @@
			}

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

			/// <summary>
			/// 是否是真实的新风设备【部分是能绑定新风的设备】
			/// 是否是真实的新风设备【过滤server端】
			/// </summary>
			/// <param name="device"></param>
			/// <returns></returns>
			@@ -728,12 +878,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 +887,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>
			@@ -1051,6 +1218,6 @@
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			}
			#endregion
			#endregion
			}
			}