~wjc/HomeApp.git

			@@ -115,7 +115,7 @@
			/// </summary>
			public int ZigbeeType;
			/// <summary>
			/// 当前运行程序版本信息。最大64字节
			/// 固件版本
			/// </summary>
			public int ImgVersion;
			/// <summary>
			@@ -157,7 +157,11 @@
			/// <summary>
			/// 输出簇列表
			/// </summary>
			public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
			public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
			/// <summary>
			/// 用于记录设备最新上报的属性状态信息
			/// </summary>
			public List<AttributeStatusObj> AttributeStatus = new List<AttributeStatusObj>();

			[Newtonsoft.Json.JsonIgnore]
			public DateTime LastDateTime = DateTime.MinValue;
			@@ -165,7 +169,13 @@
			/// 是否已经读取了设备状态(此属性是给主页使用的)
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public bool HadReadDeviceStatu = false;
			public bool HadReadDeviceStatu = false;

			/// <summary>
			/// 是否是低电量(这个变量目前是给传感器用的)
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public bool IsBatteryDown = false;

			/// <summary>
			/// 等待从网关接收数据的时间
			@@ -199,12 +209,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);
			}

			@@ -248,9 +258,21 @@
			{
			device = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.ColorDimmerSwitch.ToString())
			{
			device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmerSwitch>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.LevelControlSwitch.ToString())
			{
			device = Newtonsoft.Json.JsonConvert.DeserializeObject<LevelControlSwitch>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringDevice.ToString())
			{
			device = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringController.ToString())
			{
			device = Newtonsoft.Json.JsonConvert.DeserializeObject<WindowCoveringController>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.OnOffSwitch.ToString())
			{
			@@ -300,6 +322,14 @@
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.ColorTemperatureLight.ToString())
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<ColorTemperatureLight>(strDeviceByte);
			}
			else if (strDeviceType == ZigBee.Device.DeviceType.Buzzer.ToString())
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<Buzzer>(strDeviceByte);
			}
			else { return null; }
			//能少存一个变量就少存一个
			device.Type = (DeviceType)device.DeviceID;
			@@ -339,6 +369,11 @@
			/// </summary>
			public void ReSave()
			{
			if (Shared.Common.Config.Instance.Home.IsShowTemplate == true)
			{
			//展示模板时,不允许保存文件(防止属性上报用的)
			return;
			}
			if (IconPath == string.Empty)
			{
			//保存设备图标(这里会保存一次,下面就不用保存了)
			@@ -369,6 +404,11 @@
			{
			//调光器
			IconPath = "Device/Light.png";
			}
			else if (this.Type == DeviceType.ColorTemperatureLight)
			{
			//色温灯
			IconPath = "Device/ColorLightTemperature.png";
			}
			else if (this.Type == DeviceType.OnOffOutput)
			{
			@@ -439,7 +479,7 @@
			/// </summary>
			public int AttributeId;
			/// <summary>
			/// 属性值，最大占用4个字节
			/// 属性值，这个东西不需要什么高位在后低位在前,它已经是转为了10进制
			/// </summary>
			public int AttributeData;
			/// <summary>
			@@ -662,6 +702,10 @@
			/// 好像是序列号
			/// </summary>
			public string ProductCode = string.Empty;
			/// <summary>
			/// 设备功能类型(空气开关和继电器专用)
			/// </summary>
			public int FunctionType = -1;
			/// <summary>
			/// 输入簇列表
			/// </summary>
			@@ -820,6 +864,109 @@
			}
			#endregion

			#region 一键更新四寸屏按键属性
			/// <summary>
			/// 同步设备功能
			/// </summary>
			/// <returns></returns>
			public async System.Threading.Tasks.Task<SynchronizationDeviceResponseAllData> SyncMsgToBindSource(string deviceAddr, int deviceEpoint)
			{
			if (Gateway == null)
			{
			return null;
			}

			return await System.Threading.Tasks.Task.Run(async () =>
			{
			SynchronizationDeviceResponseAllData resContent = 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)
			{
			resContent = new SynchronizationDeviceResponseAllData { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			resContent = new SynchronizationDeviceResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "Bind/SyncMsgToBindSourceRespon")
			{
			var res = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
			if (res == null)
			{
			resContent = new SynchronizationDeviceResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			resContent = new SynchronizationDeviceResponseAllData { result = res };
			System.Console.WriteLine($"UI收到通知后的主题_{ topic}");
			}
			}
			};
			Gateway.Actions = action;
			DebugPrintLog("Bind/SyncMsgToBindSourceRespon_Actions 启动" + "_" + System.DateTime.Now.ToString());

			try
			{
			var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5010 } };
			Gateway.Send("Bind/SyncMsgToBindSource", jObject.ToString());
			}
			catch { }

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

			return resContent;
			});

			}

			/// <summary>
			/// 同步设备,网关反馈具体信息
			/// </summary>
			[System.Serializable]
			public class SynchronizationDeviceResponseAllData
			{
			/// <summary>
			/// 错误信息
			/// </summary>
			public string errorMessageBase;
			/// <summary>
			/// 网关信息错误反馈
			/// <para>当网关接收到客户端信息后，出现以下异常情况将反馈错误。</para>
			/// </summary>
			public ErrorResponData errorResponData;
			/// <summary>
			/// 同步结果
			/// 0:成功：网关内部自动写入设备目标名字、设备目标功能类型、场景目标名字、utc时间写入4寸屏
			/// 1:失败
			/// </summary>
			public int result;
			}
			#endregion

			#region 删除设备（使设备离网）
			/// <summary>
			/// 删除设备（使设备离网）
			@@ -870,7 +1017,7 @@
			}
			};
			Gateway.Actions += action;
			System.Console.WriteLine("RemoveDevice_Actions 启动" + "_" + System.DateTime.Now.ToString());
			DebugPrintLog("RemoveDevice_Actions 启动" + "_" + System.DateTime.Now.ToString());

			try
			{
			@@ -908,7 +1055,7 @@
			d = new RemoveDeviceResponseAllData { errorMessageBase = " 回复超时，请重新操作" };
			}
			Gateway.Actions -= action;
			System.Console.WriteLine("RemoveDevice_Actions 退出" + System.DateTime.Now.ToString());
			DebugPrintLog("RemoveDevice_Actions 退出" + System.DateTime.Now.ToString());

			return d;
			});