~wjc/HomeApp.git

			@@ -130,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)
			@@ -151,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)
			@@ -164,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)
			@@ -177,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)
			@@ -204,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)
			{
			//电池设备不支持绑定
			@@ -249,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)
			{
			//电池设备不支持绑定
			@@ -356,7 +356,7 @@
			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)
			{
			if (BindInfo.checkRealFreshAirDevice(device) == false)
			@@ -377,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)
			@@ -390,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)
			@@ -403,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)
			@@ -452,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);
			@@ -584,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)
			@@ -627,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)
			@@ -647,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)
			@@ -667,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)
			@@ -754,8 +754,8 @@
			{
			bool result = true;
			//获取设备属于【简约多功能面板】
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
			{
			@@ -802,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)
			{