~wjc/HomeApp.git

			@@ -54,6 +54,10 @@
			foreach (var bDev in bList)
			{
			var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
			if (device == null)
			{
			continue;
			}
			switch (curBindType)
			{
			case 0:
			@@ -128,7 +132,6 @@
			//空调绑定类型
			if (device.Type == DeviceType.Thermostat && bDev.BindCluster == 513)
			{
			//Thermostat是空调
			tempList.Add(bDev);
			}
			}
			@@ -223,6 +226,10 @@
			foreach (var bDev in bList)
			{
			var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
			if (device == null)
			{
			continue;
			}
			switch (curBindType)
			{
			case 0:
			@@ -296,7 +303,6 @@
			//空调绑定类型
			if (device.Type == DeviceType.Thermostat && bDev.BindCluster == 513)
			{
			//Thermostat是空调
			tempList.Remove(bDev.KeyEpoint);
			}
			}
			@@ -393,10 +399,10 @@
			roomIncludeMatchDevice.Add(device);
			}
			}
			if (device.Type == DeviceType.DimmableLight)
			{
			roomIncludeMatchDevice.Add(device);
			}
			//if (device.Type == DeviceType.DimmableLight)
			//{
			// roomIncludeMatchDevice.Add(device);
			//}
			break;
			case 4:
			if (device.Type == DeviceType.WindowCoveringDevice)
			@@ -407,7 +413,10 @@
			case 5:
			if (device.Type == DeviceType.Thermostat)
			{
			//Thermostat是空调
			if (BindInfo.checkRealAcDevice(device) == false)
			{
			continue;
			}
			roomIncludeMatchDevice.Add(device);
			}
			break;
			@@ -579,10 +588,10 @@
			{
			currentPanelBindSupportDeviceListTemp.Add(device);
			}
			if (device.Type == DeviceType.DimmableLight)
			{
			currentPanelBindSupportDeviceListTemp.Add(device);
			}
			//if (device.Type == DeviceType.DimmableLight)
			//{
			// currentPanelBindSupportDeviceListTemp.Add(device);
			//}
			break;
			case 4:
			if (device.Type == DeviceType.WindowCoveringDevice)
			@@ -593,7 +602,10 @@
			case 5:
			if (device.Type == DeviceType.Thermostat)
			{
			//Thermostat是空调
			if (BindInfo.checkRealAcDevice(device) == false)
			{
			continue;
			}
			currentPanelBindSupportDeviceListTemp.Add(device);
			}
			break;
			@@ -715,10 +727,6 @@
			undistruibuteDevList.Add(device);
			}
			}
			if (device.Type == DeviceType.DimmableLight)
			{
			undistruibuteDevList.Add(device);
			}
			break;
			case 4:
			if (device.Type == DeviceType.WindowCoveringDevice)
			@@ -729,7 +737,10 @@
			case 5:
			if (device.Type == DeviceType.Thermostat)
			{
			//Thermostat是空调
			if (BindInfo.checkRealAcDevice(device) == false)
			{
			continue;
			}
			undistruibuteDevList.Add(device);
			}
			break;
			@@ -826,21 +837,12 @@
			curRoomDeviceListTemp.Add(device);
			}
			}
			if (device.Type == DeviceType.DimmableLight)
			{
			if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//Thermostat是空调
			curRoomDeviceListTemp.Add(device);
			}
			}
			break;
			case 4:
			if (device.Type == DeviceType.WindowCoveringDevice)
			{
			if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//Thermostat是空调
			curRoomDeviceListTemp.Add(device);
			}
			}
			@@ -848,11 +850,11 @@
			case 5:
			if (device.Type == DeviceType.Thermostat)
			{
			if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			if (BindInfo.checkRealAcDevice(device) == false)
			{
			//Thermostat是空调
			curRoomDeviceListTemp.Add(device);
			continue;
			}
			curRoomDeviceListTemp.Add(device);
			}
			break;
			case 6: