~wjc/HomeApp.git

			@@ -173,7 +173,7 @@
			//设备控制状态反馈
			else if (reportTopic == "DeviceDefaultAck")
			{
			//this.DeviceControlResponePush(JObject.Parse(msgData));
			this.DeviceControlResponePush(JObject.Parse(msgData));
			}
			//撤防
			else if (topic == gatewayId + "/Security/WithdrawMode_Respon")
			@@ -249,6 +249,32 @@
			locadevice.HadReadDeviceStatu = true;
			}
			}
			#endregion

			#region ■ 电量推送
			//电量推送
			if (report.DeviceStatusReport.CluterID == 1)
			{
			foreach (var attData in report.DeviceStatusReport.AttriBute)
			{
			//电量
			if (attData.AttributeId == 33)
			{
			string receiptData = string.Empty;
			//两个两个位置替换
			for (int i = attData.AttriButeDataHex.Length - 1; i >= 0; i = i - 2)
			{
			receiptData += attData.AttriButeDataHex[i - 1].ToString() + attData.AttriButeDataHex[i].ToString();
			}
			int batteryValue = Convert.ToInt32(receiptData, 16);
			//低于20%,则代表电量低
			locadevice.IsBatteryDown = batteryValue < 20;
			}
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			}

			#endregion

			#region ■ 窗帘数据
			@@ -406,10 +432,37 @@
			else if (report.DeviceStatusReport.CluterID == 8)
			{
			locadevice.DeviceStatusReport = report.DeviceStatusReport;
			if (locadevice.Type == DeviceType.DimmableLight && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			//此属性表明当前亮度程度
			((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			if (locadevice.Type == DeviceType.DimmableLight)
			{
			//此属性表明当前亮度程度
			((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			}
			else if (locadevice.Type == DeviceType.ColorTemperatureLight)
			{
			//此属性表明当前亮度程度
			((ColorTemperatureLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
			}
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			}
			#endregion

			#region ■ 色温数据
			//色温数据
			else if (report.DeviceStatusReport.CluterID == 768)
			{
			locadevice.DeviceStatusReport = report.DeviceStatusReport;
			if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			if (locadevice.Type == DeviceType.ColorTemperatureLight)
			{
			//此属性表明当前色温
			int value = report.DeviceStatusReport.AttriBute[0].AttriButeData != 0 ? 1000000 / report.DeviceStatusReport.AttriBute[0].AttriButeData : 0;
			((ColorTemperatureLight)locadevice).ColorTemperature = value;
			}
			//已经接收到状态
			locadevice.HadReadDeviceStatu = true;
			}
			@@ -510,11 +563,16 @@
			strValue = strValue.Substring(0, strValue.Length - 1);
			humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
			}
			//温度传感器
			//湿度传感器
			if (locadevice is TemperatureSensor)
			{
			((TemperatureSensor)locadevice).Humidity = humidity;
			}
			//新风的湿度传感器
			else if (locadevice is HumiditySensor)
			{
			((HumiditySensor)locadevice).Humidity = humidity;
			}
			//PM2.5传感器
			else if (locadevice is PMSensor)
			{