~xm/HomeApp.git

			@@ -235,104 +235,6 @@
			#endregion

			#region PIR传感器参数配置
			///<summary >
			///PIR传感器参数配置
			/// </summary>
			public async System.Threading.Tasks.Task<ResponseAllData> SetPIRSensorParamateAsync(ConfigureParamates configureParamates)
			{
			ResponseAllData result = null;
			if (Gateway == null)
			{
			result = new ResponseAllData { errorMessageBase = "当前没有网关" };
			return result;
			}
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			result = new ResponseAllData { errorMessageBase = "网关错误回复，且数据是空" };
			}

			else
			{
			result = new ResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "ZbDataPassthrough")
			{
			var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

			if (clientDataPassthroughResponseData == null)
			{
			result = new ResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			if (clientDataPassthroughResponseData?.PassData != null)
			{
			var data = clientDataPassthroughResponseData.PassData;
			if (data.Length == 16)
			{
			var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
			if (command == "0002")
			{
			var tempD = new ResponseData();
			tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
			tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
			if (tempD.command == "0300")
			{
			result = new ResponseAllData { responseData = tempD };
			DebugPrintLog($"UI收到通知后的主题_command:0300_{ topic}");
			}
			}
			}
			}
			}
			}
			};

			Gateway.Actions += action;
			System.Console.WriteLine("ClientDataPassthrough_Actions 启动" + System.DateTime.Now.ToString());

			try
			{
			var passData = SetPIRSensorData(configureParamates);
			var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", 200 }, { "Cluster_ID", 64513 }, { "Command", 0 } };
			var data = new JObject { { "PassData", passData } };
			jObject.Add("Data", data);
			Gateway.Send(("ClientDataPassthrough"), jObject.ToString());
			}
			catch { }

			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < 9000)//WaitReceiveDataTime)
			{
			await System.Threading.Tasks.Task.Delay(10);
			if (result != null)
			{
			break;
			}
			}
			if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
			{
			result = new ResponseAllData { errorMessageBase = " 回复超时，请重新操作" };
			}
			Gateway.Actions -= action;
			System.Console.WriteLine("ClientDataPassthrough_Actions 退出" + System.DateTime.Now.ToString());

			return result;
			});
			}

			/// <summary>
			/// PIR配置参数回复
			@@ -408,314 +310,6 @@
			public int dimmerLevel = 0;
			}

			/// <summary>
			/// 配置PIR配置参数
			/// <para>发配置按键指示灯颜色命令时，此时为发送到网关的透传数据</para>
			/// </summary>
			string SetPIRSensorData(ConfigureParamates configureParamates)
			{
			string data = "";
			string dataLength = "10";
			string dataComand1 = "00";
			string dataComand2 = "03";
			string dataSerialNum = "01";
			string addDataLength = "0C";
			string levelEnable = "";
			string levelSize = "";
			string controlDevEnable = "";
			string transitionTime = "";
			string iasReportPeriod = "";
			string mode = "";
			string type = "";
			string dimmerOnTime = "";
			string dimmerOffTime = "";
			string dimmerLevel = "";
			try
			{
			if (configureParamates != null)
			{
			//levelEnable
			if (configureParamates.levelEnable)
			{
			levelEnable = "01";
			}
			else
			{
			levelEnable = "00";
			}
			//光照等级
			if (configureParamates.levelSize > 0)
			{
			var tempLevelEnable = Convert.ToString(configureParamates.levelSize, 16);
			levelSize = tempLevelEnable.ToString().PadLeft(2, '0');
			}
			else
			{
			levelSize = "00";
			}
			//controlDevEnable
			if (configureParamates.controlDevEnable)
			{
			controlDevEnable = "01";
			}
			else
			{
			controlDevEnable = "00";
			}
			//transitionTime,iasReportPeriod
			for (int j = 0; j < 2; j++)
			{
			var tempBytes = new byte[2];
			if (j == 0)
			{
			for (int i = 0; i < 2; i++)
			{
			tempBytes[i] = (byte)(configureParamates.transitionTime >> (i * 8) & 0xff);
			}
			}
			else
			{
			for (int i = 0; i < 2; i++)
			{
			tempBytes[i] = (byte)(configureParamates.iasReportPeriod >> (i * 8) & 0xff);
			}
			}
			var time1 = Convert.ToString(tempBytes[0], 16);
			var time2 = Convert.ToString(tempBytes[1], 16);
			if (time1.Length == 1)
			{
			time1 = "0" + time1;
			}
			if (time2.Length == 1)
			{
			time2 = "0" + time2;
			}
			if (j == 0)
			{
			transitionTime = (time1 + time2).ToUpper();

			}
			else
			{
			iasReportPeriod = (time1 + time2).ToUpper();
			}
			}
			//mode
			if (configureParamates.mode == 1)
			{
			mode = "01";
			}
			else
			{
			mode = "00";
			}
			//type
			if (configureParamates.type == 1)
			{
			type = "01";
			}
			else
			{
			type = "00";
			}
			//dimmerOnTime
			if (configureParamates.dimmerOnTime > 0)
			{
			var tempDimmerOnTime = Convert.ToString(configureParamates.dimmerOnTime, 16);
			dimmerOnTime = tempDimmerOnTime.ToString().PadLeft(2, '0');
			}
			else
			{
			dimmerOnTime = "00";
			}
			dimmerOnTime = dimmerOnTime.ToUpper();
			if (configureParamates.dimmerOffTime > 0)
			{
			var tempDimmerOffTime = Convert.ToString(configureParamates.dimmerOffTime, 16);
			dimmerOffTime = tempDimmerOffTime.ToString().PadLeft(2, '0');
			}
			else
			{
			dimmerOffTime = "00";
			}
			dimmerOffTime = dimmerOffTime.ToUpper();
			//dimmerLevel
			string temp = "";
			var sbString = new System.Text.StringBuilder();
			string temp2 = Convert.ToString(configureParamates.dimmerLevel, 16);
			switch (temp2.Length)
			{
			case 1:
			temp = "0" + temp2;
			break;
			case 2:
			temp = temp2;
			break;
			}
			sbString.Append(temp.ToUpper());

			data = dataLength + dataComand1 + dataComand2 + dataSerialNum + addDataLength +
			levelEnable + levelSize + controlDevEnable + transitionTime + iasReportPeriod
			+ mode + type + dimmerOnTime + dimmerOffTime + sbString;
			}
			}
			catch { };

			return data;
			}
			#endregion

			#region 获取PIR配置数据
			///<summary >
			///PIR传感器参数配置
			/// <para>reserve:0-ff</para>
			/// </summary>
			public async System.Threading.Tasks.Task<ParamatesInfo> GetPIRSensorParamateAsync(string reserve = "01")
			{
			ParamatesInfo result = null;
			if (Gateway == null)
			{
			result = new ParamatesInfo { errorMessageBase = "当前没有网关" };
			return result;
			}
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			result = new ParamatesInfo { errorMessageBase = "网关错误回复，且数据是空" };
			}

			else
			{
			result = new ParamatesInfo { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "ZbDataPassthrough")
			{
			var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

			if (clientDataPassthroughResponseData == null)
			{
			result = new ParamatesInfo { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			if (clientDataPassthroughResponseData?.PassData != null)
			{
			var data = clientDataPassthroughResponseData.PassData;
			if (data.Length == 34)
			{
			var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
			if (command == "0302")
			{
			var le = data[10].ToString() + data[11].ToString();
			var tempD = new ConfigureParamates();

			if (le == "01")
			{
			tempD.levelEnable = true;
			}
			else
			{
			tempD.levelEnable = false;
			}

			var size = data[12].ToString() + data[13].ToString();
			tempD.levelSize = Convert.ToInt32(size, 16);

			var cdl = data[14].ToString() + data[15].ToString();
			if (cdl == "01")
			{
			tempD.controlDevEnable = true;
			}
			else
			{
			tempD.controlDevEnable = false;
			}
			tempD.transitionTime = Convert.ToInt32(data[18].ToString() + data[19].ToString() + data[16].ToString() + data[17].ToString(), 16);
			tempD.iasReportPeriod = Convert.ToInt32(data[22].ToString() + data[23].ToString() + data[20].ToString() + data[21].ToString(), 16);
			tempD.mode = Convert.ToInt32(data[24].ToString() + data[25].ToString(), 16);
			tempD.type = Convert.ToInt32(data[26].ToString() + data[27].ToString(), 16);
			tempD.dimmerOnTime = Convert.ToInt32(data[28].ToString() + data[29].ToString(), 16);
			tempD.dimmerOffTime = Convert.ToInt32(data[30].ToString() + data[31].ToString(), 16);
			tempD.dimmerLevel = Convert.ToInt32(data[32].ToString() + data[33].ToString(), 16);

			result = new ParamatesInfo { configureParamates = tempD };
			System.Console.WriteLine($"UI收到通知后的主题_command:0301_{ topic}");

			}
			}
			}
			}
			}
			};

			Gateway.Actions += action;
			System.Console.WriteLine("ClientDataPassthrough_Actions 启动" + System.DateTime.Now.ToString());

			try
			{
			var passData = GetPIRSensorData(reserve);
			var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", 200 }, { "Cluster_ID", 64513 }, { "Command", 0 } };
			var data = new JObject { { "PassData", passData } };
			jObject.Add("Data", data);
			Gateway.Send(("ClientDataPassthrough"), jObject.ToString());
			}
			catch { }

			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < 9000)//WaitReceiveDataTime)
			{
			await System.Threading.Tasks.Task.Delay(10);
			if (result != null)
			{
			break;
			}
			}
			if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
			{
			result = new ParamatesInfo { errorMessageBase = " 回复超时，请重新操作" };
			}
			Gateway.Actions -= action;
			System.Console.WriteLine("ClientDataPassthrough_Actions 退出" + System.DateTime.Now.ToString());

			return result;
			});
			}

			/// <summary>
			///PIR光照能力值
			/// <para>发配置按键指示灯颜色命令时，此时为发送到网关的透传数据</para>
			/// </summary>
			string GetPIRSensorData(string reserve)
			{
			string data = "";
			string dataLength = "05";
			string dataComand1 = "01";
			string dataComand2 = "03";
			string dataSerialNum = "01";
			string addDataLength = "01";
			string reserveData = reserve;

			try
			{
			data = dataLength + dataComand1 + dataComand2 + dataSerialNum + addDataLength +
			reserveData;
			}
			catch { };

			return data;
			}
			#endregion

			#region 获取PIR lux值（Lux值）