~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -17,12 +17,62 @@
			{
			get
			{
			if(_instance == null)
			if (_instance == null)
			{
			_instance = new ReadDeviceAttributeLogic();
			}
			return _instance;
			}
			}

			#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
			@@ -35,6 +85,10 @@
			/// <param name="device">设备</param>
			public void SendACStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			new System.Threading.Thread(() =>
			{
			SendFanStatuComand(device);
			@@ -48,8 +102,12 @@
			/// SendThermostatStatuComand
			/// </summary>
			/// <param name="device">设备</param>
			private void SendThermostatStatuComand(CommonDevice device)
			public void SendThermostatStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			@@ -99,6 +157,10 @@
			/// <param name="device">设备</param>
			private void SendFanStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			@@ -131,6 +193,10 @@
			/// <param name="device">窗帘</param>
			public void SendCurtainStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			@@ -169,6 +235,10 @@
			/// <param name="device"></param>
			public void SendDimmableLightStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			new System.Threading.Thread(() =>
			{
			SendSwitchStatuComand(device);
			@@ -184,6 +254,10 @@
			/// <param name="device">窗帘</param>
			private void SendSwitchStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			@@ -209,6 +283,10 @@
			/// <param name="device">窗帘</param>
			private void SendLevelStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			@@ -229,5 +307,68 @@
			}

			#endregion

			#region ◆ 温湿度____________________________

			/// <summary>
			/// 读取温度
			/// </summary>
			/// <param name="device"></param>
			public void SendTemperatureStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			{ "Epoint", device.DeviceEpoint },
			{ "Cluster_ID", (int)Cluster_ID.TemperatureMeasurement },
			{ "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());
			}

			/// <summary>
			/// 读取湿度
			/// </summary>
			/// <param name="device"></param>
			public void SendHumidityStatuComand(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject
			{
			{ "DeviceAddr",device.DeviceAddr },
			{ "Epoint", device.DeviceEpoint },
			{ "Cluster_ID", (int)Cluster_ID.RelativeHumidityMeasurement },
			{ "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

			}
			}