~wjc/HomeApp.git

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

			#endregion
			@@ -126,7 +130,7 @@
			case BindType.FreshAir:
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (BindInfo.checkRealFreshAirDevice(device) == false)
			@@ -147,7 +151,7 @@
			curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == DeviceType.FreshAirHumiditySensor)
			@@ -160,7 +164,7 @@
			case BindType.PM:
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == DeviceType.PMSensor)
			@@ -173,7 +177,7 @@
			case BindType.AC:
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == DeviceType.Thermostat)
			@@ -200,7 +204,7 @@
			List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			var device = HdlDeviceCommonLogic.Current.GetDevice(de);
			if (device != null)
			{
			//电池设备不支持绑定
			@@ -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);
			@@ -241,7 +249,7 @@
			List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			var device = HdlDeviceCommonLogic.Current.GetDevice(de);
			if (device != null)
			{
			//电池设备不支持绑定
			@@ -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();
			@@ -344,13 +356,10 @@
			case BindInfo.BindType.FreshAir:
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			var device = HdlDeviceCommonLogic.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;
			}
			@@ -368,7 +377,7 @@
			roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			var device = HdlDeviceCommonLogic.Current.GetDevice(de);
			if (device != null)
			{
			if (device.Type == DeviceType.FreshAirHumiditySensor)
			@@ -381,7 +390,7 @@
			case BindInfo.BindType.PM:
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			var device = HdlDeviceCommonLogic.Current.GetDevice(de);
			if (device != null)
			{
			if (device.Type == DeviceType.PMSensor)
			@@ -394,7 +403,7 @@
			case BindInfo.BindType.AC:
			foreach (var de in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(de);
			var device = HdlDeviceCommonLogic.Current.GetDevice(de);
			if (device != null)
			{
			if (device.Type == DeviceType.Thermostat)
			@@ -443,7 +452,7 @@
			List<CommonDevice> UndistributeCommonDeviceListTemp = new List<CommonDevice>();

			//获取本地设备列表
			foreach (var tempDev in Shared.Common.LocalDevice.Current.listAllDevice)
			foreach (var tempDev in HdlDeviceCommonLogic.Current.listAllDevice)
			{
			//获取设备所属房间
			var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
			@@ -575,7 +584,7 @@
			}
			foreach (var deviceKeys in r.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (BindInfo.checkRealFreshAirDevice(device) == false)
			@@ -618,7 +627,7 @@
			}
			foreach (var deviceKeys in r.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == DeviceType.FreshAirHumiditySensor)
			@@ -638,7 +647,7 @@
			}
			foreach (var deviceKeys in r.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == DeviceType.PMSensor)
			@@ -658,7 +667,7 @@
			}
			foreach (var deviceKeys in r.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			if (device.Type == DeviceType.Thermostat)
			@@ -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 = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
			if (deviceEnumInfo.ConcreteType == 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>
			@@ -776,7 +802,7 @@
			}
			foreach (var deviceKeys in room.ListDevice)
			{
			var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
			//检测该设备能否显示
			if (CheckCanShowDevice(device, curDeviceBindType) == false)
			{