~wjc/HomeApp.git

			@@ -41,88 +41,28 @@
			#region ■ 写入设备属性_______________________

			/// <summary>
			/// 设置空调的自定义模式
			/// 获取更改设备私有属性的命令
			/// </summary>
			/// <param name="device">设备对象</param>
			/// <param name="clusterId">镞ID</param>
			/// <param name="attributeId">属性ID</param>
			/// <param name="attributeDataType">数据类型</param>
			/// <param name="attributeData">需要写入的数据(数值或者字符串)</param>
			/// <param name="clusterId"></param>
			/// <param name="attributeId"></param>
			/// <param name="attributeDataType"></param>
			/// <param name="attributeData"></param>
			/// <returns></returns>
			public async System.Threading.Tasks.Task<CommonDevice.SetWritableValueResponAllData> WriteDeviceAttribute(CommonDevice device, int clusterId, int attributeId, int attributeDataType, object attributeData)
			public string GetWriteDeviceAttributeText(string DeviceAddr, int DeviceEpoint, int clusterId, int attributeId, int attributeDataType, object attributeData)
			{
			var MyGateway = device.Gateway;
			if (MyGateway == null)
			var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", clusterId }, { "Command", 120 } };
			Newtonsoft.Json.Linq.JObject data = null;
			if (attributeData is int)
			{
			return null;
			data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", Convert.ToInt32(attributeData) } };
			}

			CommonDevice.SetWritableValueResponAllData d = null;
			Action<string, string> action = (topic, message) =>
			else
			{
			var gatewayID = topic.Split('/')[0];
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			if (temp == null)
			{
			d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			d = new CommonDevice.SetWritableValueResponAllData { errorResponData = temp, errorMessageBase = HdlCheckLogic.Current.CheckCommonErrorCode(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "SetWritableValue_Respon")
			{
			var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.SetWritableValueResponData>(jobject["Data"].ToString());
			if (tempData == null)
			{
			d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = tempData };
			}
			}
			};
			MyGateway.Actions += action;
			try
			{
			var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", clusterId }, { "Command", 120 } };
			Newtonsoft.Json.Linq.JObject data = null;
			if (attributeData is int)
			{
			data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", Convert.ToInt32(attributeData) } };
			}
			else
			{
			data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", attributeData.ToString() } };
			}
			jObject.Add("Data", data);
			MyGateway.Send("SetWritableValue", jObject.ToString());
			data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", attributeData.ToString() } };
			}
			catch { }
			jObject.Add("Data", data);

			var timeOut = 0;
			while (timeOut <= 30)
			{
			await System.Threading.Tasks.Task.Delay(100);
			if (d != null)
			{
			break;
			}
			timeOut++;
			}
			if (timeOut > 30 && d == null)
			{
			d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = " 回复超时，请重新操作" };
			}
			MyGateway.Actions -= action;
			return d;
			return jObject.ToString();
			}

			#endregion
			@@ -236,6 +176,110 @@

			#endregion

			#region ■ 新风_______________________________
			/// <summary>
			/// SendFreshAirStatuComand
			/// </summary>
			/// <param name="device">设备</param>
			public void SendFreshAirStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			new System.Threading.Thread(() =>
			{
			SendFreshAirFanStatuComand(device);
			System.Threading.Thread.Sleep(300);
			})
			{ IsBackground = true }.Start();
			}

			/// <summary>
			/// SendFanStatuComand
			/// </summary>
			/// <param name="device">设备</param>
			private void SendFreshAirFanStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			{ "Epoint", device.DeviceEpoint },
			{ "Cluster_ID", (int)Cluster_ID.FanControl },
			{ "Command", 108 }
			};
			var attriBute = new Newtonsoft.Json.Linq.JArray
			{
			new Newtonsoft.Json.Linq.JObject
			{
			{ "AttriButeId", (int)AttriButeId.FanMode}
			}
			};
			var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
			jObject.Add("Data", data);
			device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
			}

			#endregion

			#region ■ PM2.5_______________________________
			/// <summary>
			/// SendPmSensorComand
			/// </summary>
			/// <param name="device">设备</param>
			public void SendPmSensorComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			new System.Threading.Thread(() =>
			{
			SendPmSensorStatuComand(device);
			//读取Pm2.5传感器的温度数据
			HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(device);
			//读取Pm2.5传感器的湿度数据
			HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(device);
			System.Threading.Thread.Sleep(300);
			})
			{ IsBackground = true }.Start();
			}

			/// <summary>
			/// SendFanStatuComand
			/// </summary>
			/// <param name="device">设备</param>
			private void SendPmSensorStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			{ "Epoint", device.DeviceEpoint },
			{ "Cluster_ID", (int)Cluster_ID.PmTwoPointFiveMeasurement },
			{ "Command", 108 }
			};
			var attriBute = new Newtonsoft.Json.Linq.JArray
			{
			new Newtonsoft.Json.Linq.JObject
			{
			{ "AttriButeId", (int)AttriButeId.MeasuredValue}
			}
			};
			var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
			jObject.Add("Data", data);
			device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
			}

			#endregion

			#region ■ 窗帘_______________________________
			/// <summary>
			/// 发送获取窗帘状态命令
			@@ -354,6 +398,32 @@
			var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
			jObject.Add("Data", data);
			device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
			}

			#endregion

			#region ■ 色温灯_____________________________

			/// <summary>
			/// 发送获取色温灯状态命令
			/// </summary>
			/// <param name="device"></param>
			public void SendColorTemperatureLightStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var colorDevice = (ColorTemperatureLight)device;
			new System.Threading.Thread(() =>
			{
			colorDevice.ReadOnOffStatus();
			System.Threading.Thread.Sleep(300);
			colorDevice.ReadLevel();
			System.Threading.Thread.Sleep(300);
			colorDevice.ReadColorTemperature();
			})
			{ IsBackground = true }.Start();
			}

			#endregion