~wjc/HomeApp.git

			@@ -1549,6 +1549,141 @@
			}
			#endregion

			#region 配置接近传感
			///<summary >
			/// 配置接近传感
			/// <para>sensorEnable:传感器使能</para>
			/// </summary>
			public async System.Threading.Tasks.Task<ResponseAllData> SetProximitySensor(bool sensorEnable)
			{
			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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.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 gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

			if (gatewayTemp.clientDataPassthroughResponseData == null)
			{
			result = new ResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
			{
			var data = gatewayTemp.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 = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
			tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
			result = new ResponseAllData { responseData = tempD };
			System.Console.WriteLine($"UI收到通知后的主题_command:0500_{ topic}");
			}
			}
			}
			}
			}
			};

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

			try
			{
			var passData = SetProximitySensorData(sensorEnable);
			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>
			/// 配置接近传感
			/// [该条协议另外2个参数UI和设备都不需要，设备都同事要求传感器距离和传感器触发延迟时间都默认是FFFF]
			/// </summary>
			/// <param name="sensorEnable">传感器使能 0-disable 1-enable</param>
			/// <returns></returns>
			string SetProximitySensorData(bool sensorEnable)
			{
			string data = "";
			string dataLength = "09";
			string dataComand1 = "00";
			string dataComand2 = "05";
			string dataSerialNum = "01";
			string addDataLength = "05";
			string sEnable = "";
			try
			{
			if (sensorEnable)
			{
			sEnable = "01";
			}
			else
			{
			sEnable = "00";
			}

			data = dataLength + dataComand1 + dataComand2 + dataSerialNum + addDataLength +
			sEnable + "FFFFFFFF";
			}
			catch { };

			return data;
			}
			#endregion

			#region 获取按键指示灯开关颜色.
			///<summary >
			///获取按键指示灯开关颜色.
			@@ -2132,6 +2267,186 @@
			}
			#endregion

			#region 获取接近传感配置
			///<summary >
			///获取接近传感配置
			/// </summary>
			public async System.Threading.Tasks.Task<PanelProximitySensorResponInfo> GetProximitySensorAsync(string reserve = "01")
			{
			PanelProximitySensorResponInfo result = null;
			if (Gateway == null)
			{
			result = new PanelProximitySensorResponInfo { 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());

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

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

			if (topic == gatewayID + "/" + "ZbDataPassthrough")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

			if (gatewayTemp.clientDataPassthroughResponseData == null)
			{
			result = new PanelProximitySensorResponInfo { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
			{
			var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
			if (data.Length == 20)
			{
			var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
			if (command == "0502")
			{
			var tempR = new PanelProximitySensorInfo();
			if (data[10].ToString() + data[11].ToString() == "01")
			{
			tempR.enable = true;
			}
			else
			{
			tempR.enable = false;
			}
			tempR.sensorDistance = Convert.ToInt32(data[14].ToString() + data[15].ToString() + data[12].ToString() + data[13].ToString(), 16);
			tempR.sensorDelayTime = Convert.ToInt32(data[18].ToString() + data[19].ToString() + data[16].ToString() + data[17].ToString(), 16);
			panelProximitySensorInfo = tempR;
			result = new PanelProximitySensorResponInfo { panelProximitySensorInfo = tempR };
			System.Console.WriteLine($"UI收到通知后的主题_command:0408_{ topic}");
			}
			}
			}
			}
			}
			};

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

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

			return result;
			});
			}

			/// <summary>
			/// 获取接近传感配置数据
			/// </summary>
			string SendProiximitySensorData(string reserve)
			{
			string data = "";
			string dataLength = "05";
			string dataComand1 = "01";
			string dataComand2 = "05";
			string dataSerialNum = "01";
			string addDataLength = "01";
			string reserveData = reserve;

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

			return data;
			}

			/// <summary>
			/// 获取接近传感配置数据回复
			/// </summary>
			[System.Serializable]
			public class PanelProximitySensorResponInfo
			{
			/// <summary>
			/// 错误信息
			/// </summary>
			public string errorMessageBase;
			/// <summary>
			/// 网关信息错误反馈
			/// <para>当网关接收到客户端信息后，出现以下异常情况将反馈错误。</para>
			/// </summary>
			public ErrorResponData errorResponData;
			/// <summary>
			/// <para>获取接近传感配置数据</para>
			/// </summary>
			public PanelProximitySensorInfo panelProximitySensorInfo;
			}

			/// <summary>
			/// 获取接近传感配置
			/// </summary>
			public PanelProximitySensorInfo panelProximitySensorInfo;
			/// <summary>
			/// 获取接近传感配置数据
			/// </summary>
			[System.Serializable]
			public class PanelProximitySensorInfo
			{
			/// <summary>
			/// 传感器使能
			///false-disable true-enable
			/// </summary>
			public bool enable;

			/// <summary>
			///传感器距离
			/// </summary>
			public int sensorDistance = -1;

			/// <summary>
			/// 传感器触发延迟时间
			/// </summary>
			public int sensorDelayTime = -1;
			}
			#endregion

			#region 配置按键指示灯睡眠组分（暂时不做）
			///<summary >
			///获取按键指示灯睡眠组