~wjc/HomeApp.git

			@@ -108,7 +108,12 @@
			/// 0：设备不在线
			/// <para>1：设备在线</para>
			/// </summary>
			public int IsOnline;
			public int IsOnline;
			/// <summary>
			/// 1：路由设备
			/// <para>2：终端设备，电池设备</para>
			/// </summary>
			public int ZigbeeType;
			/// <summary>
			/// 当前运行程序版本信息。最大64字节
			/// </summary>
			@@ -194,12 +199,12 @@
			{
			return null;
			}
			var gateWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.getGatewayBaseInfo != null) && (obj.getGatewayBaseInfo.gwID == CurrentGateWayId));
			var gateWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == CurrentGateWayId));
			if (gateWay == null)
			{
			gateWay = new ZbGateway { IsVirtual = true, };
			gateWay.getGatewayBaseInfo.gwID = CurrentGateWayId;
			gateWay.getGatewayBaseInfo.HomeId = Shared.Common.Config.Instance.HomeId;
			gateWay.GwId = CurrentGateWayId;
			gateWay.HomeId = Shared.Common.Config.Instance.HomeId;
			ZbGateway.GateWayList.Add(gateWay);
			}

			@@ -291,6 +296,14 @@
			{
			device = Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.ColorTemperatureLight.ToString())
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<ColorTemperatureLight>(strDeviceByte);
			}
			else { return null; }
			//能少存一个变量就少存一个
			device.Type = (DeviceType)device.DeviceID;
			@@ -360,6 +373,11 @@
			{
			//调光器
			IconPath = "Device/Light.png";
			}
			else if (this.Type == DeviceType.ColorTemperatureLight)
			{
			//色温灯
			IconPath = "Device/ColorLightTemperature.png";
			}
			else if (this.Type == DeviceType.OnOffOutput)
			{
			@@ -375,6 +393,11 @@
			{
			//新风
			IconPath = "Device/FreshAirEpoint.png";
			}
			else if (this.Type == DeviceType.PMSensor)
			{
			//PM2.5空气质量传感器
			IconPath = "Device/AirQualitySensorEpoint.png";
			}
			else if (this.Type == DeviceType.FreshAirHumiditySensor)
			{
			@@ -462,6 +485,8 @@
			/// 温度测量功能的设备如：温度传感器。。。
			/// <para>1029:Relative Humidity Measurement,设备支持“湿度测量功能”</para>
			/// 湿度测量功能的设备如：湿度传感器。。。
			/// <para>1066:Pm2.5 Measurement,设备支持“pm2.5测量功能”</para>
			/// Pm2.5测量功能的设备如：Pm2.5传感器。。。
			/// </summary>
			public int InCluster;
			}
			@@ -732,80 +757,6 @@
			#endregion

			#region 修改设备端口名称
			///<summary >
			/// 修改设备端口（按键）名称
			/// <para>Gateway:设备所属网关（调用方法：device.Gateway)</para>
			/// <para>deviceName:按键名称</para>
			/// </summary>
			public async System.Threading.Tasks.Task<DeviceRenameAllData> RenameDeviceNameAsync(string deviceAddr, int deviceEpoint, string deviceName)
			{
			if (Gateway == null)
			{
			return null;
			}
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			DeviceRenameAllData d = null;
			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)
			{
			d = new DeviceRenameAllData { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			d = new DeviceRenameAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "DeviceRenameRespon")
			{
			var receiptData = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceRenameResponseData>(jobject["Data"].ToString());
			d = new DeviceRenameAllData { deviceRenameData = receiptData };
			}
			};
			Gateway.Actions += action;
			System.Console.WriteLine("DeviceRename_Actions 启动" + "_" + System.DateTime.Now.ToString());
			try
			{
			var bytes = new byte[64];
			var reamarkGwBytes = Encoding.UTF8.GetBytes(deviceName);
			System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 64 < reamarkGwBytes.Length ? 64 : reamarkGwBytes.Length);
			deviceName = Encoding.UTF8.GetString(bytes);

			var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 96 } };
			var data = new JObject { { "DeviceName", deviceName } };
			jObject.Add("Data", data);
			Gateway?.Send(("DeviceRename"), jObject.ToString());
			}
			catch { }

			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
			{
			await System.Threading.Tasks.Task.Delay(10);
			if (d != null)
			{
			break;
			}
			}
			if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
			{
			d = new DeviceRenameAllData { errorMessageBase = " 回复超时，请重新操作" };
			}

			Gateway.Actions -= action;
			System.Console.WriteLine("DeviceRename_Actions退出" + System.DateTime.Now.ToString());
			return d;
			});
			}

			/// <summary>
			/// 重命名设备,网关反馈具体信息
			@@ -847,80 +798,6 @@
			#endregion

			#region 修改设备mac名称
			///<summary >
			/// 修改设备mac名称
			/// <para>macName:设备名称</para>
			/// </summary>
			public async System.Threading.Tasks.Task<RenameDeviceMacNameAllData> RenameDeviceMacNameAsync(string deviceAddr, int deviceEpoint, string macName)
			{
			if (Gateway == null)
			{
			return null;
			}
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			RenameDeviceMacNameAllData d = null;
			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)
			{
			d = new RenameDeviceMacNameAllData { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			d = new RenameDeviceMacNameAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "MacRename_Respon")
			{
			var deviceID = jobject.Value<int>("Device_ID");
			d = new RenameDeviceMacNameAllData { renameDeviceMacNameData = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight.RenameDeviceMacNameData>(jobject["Data"].ToString()) };
			}
			};
			Gateway.Actions += action;
			System.Console.WriteLine("MacRename_Actions 启动" + "_" + System.DateTime.Now.ToString());
			try
			{
			var bytes = new byte[64];
			var reamarkGwBytes = Encoding.UTF8.GetBytes(macName);
			System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 64 < reamarkGwBytes.Length ? 64 : reamarkGwBytes.Length);
			macName = Encoding.UTF8.GetString(bytes);

			var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 100 } };
			var data = new JObject { { "MacName", macName } };
			jObject.Add("Data", data);
			Gateway?.Send(("MacRename"), jObject.ToString());
			}
			catch { }

			var dateTime = DateTime.Now;
			while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
			{
			await System.Threading.Tasks.Task.Delay(10);
			if (d != null)
			{
			break;
			}
			}

			if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
			{
			d = new RenameDeviceMacNameAllData { errorMessageBase = " 回复超时，请重新操作" };
			}

			Gateway.Actions -= action;
			System.Console.WriteLine("MacRename_Action退出" + System.DateTime.Now.ToString());
			return d;
			});
			}

			/// <summary>
			/// 修改设备mac名称数据,网关反馈具体信息