~wjc/HomeApp.git

			@@ -22,14 +22,7 @@
			[System.Serializable]
			public class ZbGateway : ZbGatewayData
			{
			public ZbGateway()
			{
			this.Type = DeviceType.ZbGateway;
			}



			#region 网关特殊信息处理
			#region 一堆变量
			/// <summary>
			/// 主网关
			/// </summary>
			@@ -38,19 +31,7 @@
			{
			get
			{
			return GateWayList.Find((obj) => { return obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId && obj.getGatewayBaseInfo.IsMainGateWay; });
			}
			}

			/// <summary>
			/// 主网关
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public bool IsMainGateWay
			{
			get
			{
			return getGatewayBaseInfo != null && getGatewayBaseInfo.IsMainGateWay;
			return GateWayList.Find((obj) => { return obj.HomeId == Shared.Common.Config.Instance.HomeId && obj.IsMainGateWay; });
			}
			}

			@@ -60,25 +41,50 @@
			/// <value><c>true</c> if is remote; otherwise, <c>false</c>.</value>
			public static bool IsRemote;

			/// <summary>
			/// 是否拥有远程连接的权限
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public static bool AllowRemoteCtrl = true;

			/// <summary>
			/// 网关保存路径
			/// </summary>
			/// <value>The file path.</value>
			[Newtonsoft.Json.JsonIgnore]
			public override string FilePath
			public string FilePath
			{
			get
			{
			var deviceType = Type.ToString();
			var fileName = "Gateway_" + deviceType + "_" + this.getGatewayBaseInfo?.gwID;
			var fileName = "Gateway_" + DeviceType.ZbGateway.ToString() + "_" + this.GwId;
			return fileName;
			}
			}

			/// <summary>
			/// 等待从网关接收数据的时间
			/// </summary>
			/// <value>The wait receive data time.</value>
			[Newtonsoft.Json.JsonIgnore]
			public int WaitReceiveDataTime
			{
			get
			{
			if (Device.ZbGateway.RemoteMqttClient != null && Device.ZbGateway.RemoteMqttClient.IsConnected)
			{
			return 10000;
			}
			else
			{
			return 3000;
			}
			}
			}

			/// <summary>
			/// 局域网加密密码
			/// </summary>
			string password;
			private string password;
			/// <summary>
			/// 局域网加密密钥
			/// </summary>
			@@ -95,27 +101,6 @@
			}
			}

			#region variable
			/// <summary>
			/// 远程连接成功时的时间
			/// </summary>
			public static DateTime LoginRemoteDateTime = DateTime.Now;

			/// <summary>
			/// 同步到远程的当前时间戳
			/// </summary>Re
			public static ulong CurrentTimeStamp
			{
			get
			{
			return RemoteTimeStamp + (ulong)(DateTime.Now - LoginRemoteDateTime).TotalSeconds;
			}
			}

			/// <summary>
			/// 远程连接成功时的时间戳
			/// </summary>
			public static ulong RemoteTimeStamp;
			/// <summary>
			/// 网关是否加密
			/// </summary>
			@@ -132,71 +117,6 @@
			[Newtonsoft.Json.JsonIgnore]
			public static List<ZbGateway> GateWayList = new List<ZbGateway>();

			//当前网关中的设备列表
			[Newtonsoft.Json.JsonIgnore]
			public List<CommonDevice> DeviceList = new List<CommonDevice>();

			/// <summary>
			/// 所有网关中的设备列表
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public List<CommonDevice> AllGatewayDeviceList = new List<CommonDevice>();

			/// <summary>
			/// 网关中场景列表
			/// 一个场景中包含所有信息，包括场景设备信息
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public static List<Scene.GetSceneAllInfo> AllSceneList = new List<Scene.GetSceneAllInfo>();

			/// <summary>
			/// 网关中场景的设备列表
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public List<Scene.GetSceneDeviceListInfo> SceneDeviceList = new List<Scene.GetSceneDeviceListInfo>();

			/// <summary>
			/// 网关中逻辑列表
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public static List<Logic.GetLogicInfoResponseData> LogicList = new List<Logic.GetLogicInfoResponseData>();

			/// <summary>
			/// 网关中hdl私有按键绑定列表
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public List<HDLbutton> HdlButtonList = new List<HDLbutton>();

			//网关中新的设备列表
			[Newtonsoft.Json.JsonIgnore]
			public List<CommonDevice> ListNewDeviceInfoData = new List<CommonDevice>();

			/// <summary>
			/// 私有按键信息列表
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public System.Collections.Generic.Dictionary<string, HDLbutton> hdlButtonInfoList = new Dictionary<string, HDLbutton>();

			/// <summary>
			/// 传感器信息列表
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public System.Collections.Generic.Dictionary<string, Scene.TaskListInfo> sceneTaskInfoList = new Dictionary<string, Scene.TaskListInfo>();

			#region action variable
			/// <summary>
			/// 接收数据后回调
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			Action<object> action;
			/// <summary>
			/// 设置数据回调
			/// </summary>
			public void SetAction(Action<object> action, int timeOut = 1000)
			{
			this.action = action;
			}

			/// <summary>
			/// 网关推送数据
			/// <para>第一个参数：如果为 DeviceInComingRespon:设备新上报</para>
			@@ -211,24 +131,15 @@
			/// <para>第一个参数：如果为 ZoneTriggerReport:防区被触发时报告</para>
			/// <para>第一个参数：如果为 LogicExecuteReport:逻辑被调用反馈</para>
			/// <para>第一个参数：如果为 TimingWillArrive:时间点条件推迟执行</para>
			/// para>第一个参数：如果为 ModeTriggerReport:模式安防动作被最终激活时发送报警信息</para>
			/// <para>第一个参数：如果为 ModeTriggerReport:模式安防动作被最终激活时发送报警信息</para>
			/// <para>第一个参数：如果为 EnOrWithdrawSucceedReport:通过外部方式布防撤防成功时报告息</para>
			/// <para>第一个参数：如果为 PushTargetInfoReport:胁迫密码撤防时短信推送</para>
			/// <para>第一个参数：如果为 DeviceDefaultAck:节点设备默认反馈</para>
			/// <para>第一个参数：如果为 DDevice/IsGetEpointInfo:有新设备加入zigbee网络反馈</para>设备请求APP获取升级数据
			/// <para>第一个参数：如果为 Device/DeviceJoinZbNet:获取新设备所有端点信息是否成功反馈</para>
			/// <para>第一个参数：如果为 DeviceRequestAcUpdateData: 设备请求空调发升级数据</para>
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public Action<string, object> ReportAction;
			/// <summary>
			/// 云端通讯错误数据上报
			///<para>"ForwardGatewayNoOnLine", "当前操作的网关不在线"</para>
			///<para>"AppTimeOut", "从云端获取数据超时，请重新获取"</para>
			///<para>"AppNoLogin", "登录过期，请重新登录"</para>
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public Action<string, string> CloudErrorAction;

			/// <summary>
			/// 网关文件流内容通知
			@@ -247,8 +158,7 @@
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public Action<string, string> Actions;
			#endregion
			#endregion

			#endregion

			#region 网关API
			@@ -269,8 +179,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -278,24 +187,21 @@
			}
			else
			{
			d = new GetGwVersionAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new GetGwVersionAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "GetZbGwVersionRespon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			gatewayTemp.getGwVersion = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwVersionData>(jobject["Data"].ToString());
			var getGwVersion = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwVersionData>(jobject["Data"].ToString());

			if (gatewayTemp.getGwVersion == null)
			if (getGwVersion == null)
			{
			d = new GetGwVersionAllData { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			d = new GetGwVersionAllData { getGwVersion = gatewayTemp.getGwVersion };
			AppVersion = gatewayTemp.getGwVersion.AppVersion;
			ZigbeeVersion = gatewayTemp.getGwVersion.ZigbeeVersion;
			d = new GetGwVersionAllData { getGwVersion = getGwVersion };
			//Save();
			DebugPrintLog($"UI收到通知后的主题_{topic}");
			}
			@@ -347,16 +253,15 @@
			if (topic == gatewayID + "/" + "GetZbGwInfo_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			gatewayTemp.getGwInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwData>(jobject["Data"].ToString());
			var getGwInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwData>(jobject["Data"].ToString());

			if (gatewayTemp.getGwInfo == null)
			if (getGwInfo == null)
			{
			data = new GetGwAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			data = new GetGwAllData { getGwData = gatewayTemp.getGwInfo };
			data = new GetGwAllData { getGwData = getGwInfo };
			DebugPrintLog($"UI收到通知后的主题_{topic}");
			}
			}
			@@ -401,8 +306,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -410,13 +314,12 @@
			}
			else
			{
			d = new GetMacResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new GetMacResponData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (tempData == null)
			@@ -471,8 +374,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -480,22 +382,21 @@
			}
			else
			{
			d = new GwReNameAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new GwReNameAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "GwReName_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			gatewayTemp.gwRename = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwReNameData>(jobject["Data"].ToString());
			var gwRename = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwReNameData>(jobject["Data"].ToString());

			if (gatewayTemp.gwRename == null)
			if (gwRename == null)
			{
			d = new GwReNameAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new GwReNameAllData { gwReNameData = gatewayTemp.gwRename };
			d = new GwReNameAllData { gwReNameData = gwRename };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			@@ -554,8 +455,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -563,21 +463,20 @@
			}
			else
			{
			d = new GwSetHomeIdAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new GwSetHomeIdAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "GwSetHomeId_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			gatewayTemp.gwSetHomeId = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwSetHomeIdData>(jobject["Data"].ToString());
			if (gatewayTemp.gwSetHomeId == null)
			var gwSetHomeId = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwSetHomeIdData>(jobject["Data"].ToString());
			if (gwSetHomeId == null)
			{
			d = new GwSetHomeIdAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new GwSetHomeIdAllData { gwSetHomeIdData = gatewayTemp.gwSetHomeId };
			d = new GwSetHomeIdAllData { gwSetHomeIdData = gwSetHomeId };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			@@ -631,498 +530,6 @@
			}
			#endregion

			#region 获取已入网设备信息
			/// <summary>
			/// 获取网关设备信息(注意，这个接口会被去掉）
			/// </summary>
			public async System.Threading.Tasks.Task<List<CommonDevice>> GetGwDeviceList()
			{
			DeviceList.Clear();
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<CommonDevice>>>)(async () =>
			{
			var dateTime = DateTime.Now;
			bool canBreak = false;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);

			if (topic == gatewayID + "/" + "DeviceInfoRespon")
			{
			dateTime = DateTime.Now;
			var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
			if (totalNum == 0)
			{
			canBreak = true;
			return;
			}
			var deviceID = jobject.Value<int>("Device_ID");
			switch ((DeviceType)(deviceID))
			{
			//case DeviceType.DimmableLight:
			// var dimmableLight = new DimmableLight() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			// dimmableLight.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<DimmableLight.DeviceInfoData>(jobject["Data"].ToString());
			// if (dimmableLight.DeviceInfo == null)
			// {
			// return;
			// }
			// var light = DeviceList.Find(obj => obj.DeviceID == dimmableLight.DeviceID && obj.DeviceAddr == dimmableLight.DeviceAddr && obj.DeviceEpoint == dimmableLight.DeviceEpoint);
			// if (light == null)
			// {
			// DeviceList.Add(dimmableLight);
			// dimmableLight.DeviceName = dimmableLight.DeviceInfo.MacName;
			// dimmableLight.DeviceEpointName = dimmableLight.DeviceInfo.DeviceName;
			// dimmableLight.ImgVersion = dimmableLight.DeviceInfo.ImgVersion;
			// dimmableLight.HwVersion = dimmableLight.DeviceInfo.HwVersion;
			// dimmableLight.IsOnline = dimmableLight.DeviceInfo.IsOnline;
			// dimmableLight.DriveCode = dimmableLight.DeviceInfo.DriveCode;
			// dimmableLight.ImgTypeId = dimmableLight.DeviceInfo.ImgTypeId;
			// dimmableLight.IasDeviceType = dimmableLight.DeviceInfo.DeviceType;
			// dimmableLight.Profile = dimmableLight.DeviceInfo.Profile;
			// dimmableLight.InClusterList = dimmableLight.DeviceInfo.InClusterList;
			// dimmableLight.OutClusterList = dimmableLight.DeviceInfo.OutClusterList;
			// dimmableLight.AttributeStatus = dimmableLight.DeviceInfo.AttributeStatus;
			// //dimmableLight.Save();
			// }
			// else
			// {
			// light.DeviceInfo = dimmableLight.DeviceInfo;
			// light.DeviceName = dimmableLight.DeviceInfo.MacName;
			// light.DeviceEpointName = dimmableLight.DeviceInfo.DeviceName;
			// light.ImgVersion = dimmableLight.DeviceInfo.ImgVersion;
			// light.HwVersion = dimmableLight.DeviceInfo.HwVersion;
			// light.IsOnline = dimmableLight.DeviceInfo.IsOnline;
			// light.DriveCode = dimmableLight.DeviceInfo.DriveCode;
			// light.ImgTypeId = dimmableLight.DeviceInfo.ImgTypeId;
			// light.IasDeviceType = dimmableLight.DeviceInfo.DeviceType;
			// light.Profile = dimmableLight.DeviceInfo.Profile;
			// light.InClusterList = dimmableLight.DeviceInfo.InClusterList;
			// light.OutClusterList = dimmableLight.DeviceInfo.OutClusterList;
			// light.AttributeStatus = dimmableLight.DeviceInfo.AttributeStatus;
			// //dimmableLight.ReSave();
			// }
			// DebugPrintLog($"UI收到通知后的主题_{ topic}");

			// break;
			//case DeviceType.OnOffSwitch:
			// var panel = new Panel() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			// panel.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Panel.DeviceInfoData>(jobject["Data"].ToString());
			// if (panel.DeviceInfo == null)
			// {
			// return;
			// }
			// var panelInfo = DeviceList.Find(obj => obj.DeviceID == panel.DeviceID && obj.DeviceAddr == panel.DeviceAddr && obj.DeviceEpoint == panel.DeviceEpoint);
			// if (panelInfo == null)
			// {
			// DeviceList.Add(panel);
			// panel.DeviceName = panel.DeviceInfo.MacName;
			// panel.DeviceEpointName = panel.DeviceInfo.DeviceName;
			// panel.ImgTypeId = panel.DeviceInfo.ImgTypeId;
			// panel.ImgVersion = panel.DeviceInfo.ImgVersion;
			// panel.HwVersion = panel.DeviceInfo.HwVersion;
			// panel.IasDeviceType = panel.DeviceInfo.DeviceType;
			// panel.IsOnline = panel.DeviceInfo.IsOnline;
			// panel.DriveCode = panel.DeviceInfo.DriveCode;
			// panel.Profile = panel.DeviceInfo.Profile;
			// panel.InClusterList = panel.DeviceInfo.InClusterList;
			// panel.OutClusterList = panel.DeviceInfo.OutClusterList;
			// panel.AttributeStatus = panel.DeviceInfo.AttributeStatus;
			// //panel.Save();
			// }
			// else
			// {
			// panelInfo.DeviceInfo = panel.DeviceInfo;
			// panelInfo.DeviceName = panel.DeviceInfo.MacName;
			// panelInfo.DeviceEpointName = panel.DeviceInfo.DeviceName;
			// panelInfo.ImgVersion = panel.DeviceInfo.ImgVersion;
			// panelInfo.HwVersion = panel.DeviceInfo.HwVersion;
			// panelInfo.IsOnline = panel.DeviceInfo.IsOnline;
			// panelInfo.DriveCode = panel.DeviceInfo.DriveCode;
			// panelInfo.IasDeviceType = panel.DeviceInfo.DeviceType;
			// panelInfo.Profile = panel.DeviceInfo.Profile;
			// panelInfo.ImgTypeId = panel.DeviceInfo.ImgTypeId;
			// panelInfo.InClusterList = panel.DeviceInfo.InClusterList;
			// panelInfo.OutClusterList = panel.DeviceInfo.OutClusterList;
			// panelInfo.AttributeStatus = panel.DeviceInfo.AttributeStatus;
			// //panel.ReSave();
			// }
			// DebugPrintLog($"UI收到通知后的主题_{ topic}");

			// break;
			//case DeviceType.OnOffOutput:
			// var toggleLight = new ToggleLight() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			// toggleLight.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight.DeviceInfoData>(jobject["Data"].ToString());
			// if (toggleLight.DeviceInfo == null)
			// {
			// return;
			// }
			// var toggleLightInfo = DeviceList.Find(obj => obj.DeviceID == toggleLight.DeviceID && obj.DeviceAddr == toggleLight.DeviceAddr && obj.DeviceEpoint == toggleLight.DeviceEpoint);
			// if (toggleLightInfo == null)
			// {
			// DeviceList.Add(toggleLight);
			// toggleLight.DeviceName = toggleLight.DeviceInfo.MacName;
			// toggleLight.DeviceEpointName = toggleLight.DeviceInfo.DeviceName;
			// toggleLight.ImgVersion = toggleLight.DeviceInfo.ImgVersion;
			// toggleLight.HwVersion = toggleLight.DeviceInfo.HwVersion;
			// toggleLight.IsOnline = toggleLight.DeviceInfo.IsOnline;
			// toggleLight.DriveCode = toggleLight.DeviceInfo.DriveCode;
			// toggleLight.IasDeviceType = toggleLight.DeviceInfo.DeviceType;
			// toggleLight.Profile = toggleLight.DeviceInfo.Profile;
			// toggleLight.ImgTypeId = toggleLight.DeviceInfo.ImgTypeId;
			// toggleLight.InClusterList = toggleLight.DeviceInfo.InClusterList;
			// toggleLight.OutClusterList = toggleLight.DeviceInfo.OutClusterList;
			// toggleLight.AttributeStatus = toggleLight.DeviceInfo.AttributeStatus;
			// //toggleLight.Save();
			// }
			// else
			// {
			// toggleLightInfo.DeviceName = toggleLight.DeviceInfo.MacName;
			// toggleLightInfo.DeviceEpointName = toggleLight.DeviceInfo.DeviceName;
			// toggleLightInfo.ImgVersion = toggleLight.DeviceInfo.ImgVersion;
			// toggleLightInfo.HwVersion = toggleLight.DeviceInfo.HwVersion;
			// toggleLightInfo.IsOnline = toggleLight.DeviceInfo.IsOnline;
			// toggleLightInfo.DriveCode = toggleLight.DeviceInfo.DriveCode;
			// toggleLightInfo.IasDeviceType = toggleLight.DeviceInfo.DeviceType;
			// toggleLightInfo.Profile = toggleLight.DeviceInfo.Profile;
			// toggleLightInfo.ImgTypeId = toggleLight.DeviceInfo.ImgTypeId;
			// toggleLightInfo.InClusterList = toggleLight.DeviceInfo.InClusterList;
			// toggleLightInfo.OutClusterList = toggleLight.DeviceInfo.OutClusterList;
			// toggleLightInfo.AttributeStatus = toggleLight.DeviceInfo.AttributeStatus;
			// toggleLightInfo.DeviceInfo = toggleLight.DeviceInfo;
			// //toggleLightInfo.ReSave();
			// }
			// DebugPrintLog($"UI收到通知后的主题_{ topic}");

			// break;
			//case DeviceType.AirSwitch:
			// var airSwitch = new AirSwitch() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			// airSwitch.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<AirSwitch.DeviceInfoData>(jobject["Data"].ToString());
			// if (airSwitch.DeviceInfo == null)
			// {
			// return;
			// }
			// var airSwitchInfo = DeviceList.Find(obj => obj.DeviceID == airSwitch.DeviceID && obj.DeviceAddr == airSwitch.DeviceAddr && obj.DeviceEpoint == airSwitch.DeviceEpoint);
			// if (airSwitchInfo == null)
			// {
			// DeviceList.Add(airSwitch);
			// airSwitch.DeviceName = airSwitch.DeviceInfo.MacName;
			// airSwitch.DeviceEpointName = airSwitch.DeviceInfo.DeviceName;
			// airSwitch.ImgVersion = airSwitch.DeviceInfo.ImgVersion;
			// airSwitch.HwVersion = airSwitch.DeviceInfo.HwVersion;
			// airSwitch.IsOnline = airSwitch.DeviceInfo.IsOnline;
			// airSwitch.DriveCode = airSwitch.DeviceInfo.DriveCode;
			// airSwitch.IasDeviceType = airSwitch.DeviceInfo.DeviceType;
			// airSwitch.Profile = airSwitch.DeviceInfo.Profile;
			// airSwitch.ImgTypeId = airSwitch.DeviceInfo.ImgTypeId;
			// airSwitch.InClusterList = airSwitch.DeviceInfo.InClusterList;
			// airSwitch.OutClusterList = airSwitch.DeviceInfo.OutClusterList;
			// airSwitch.AttributeStatus = airSwitch.DeviceInfo.AttributeStatus;
			// //airSwitch.Save();
			// }
			// else
			// {
			// airSwitchInfo.DeviceName = airSwitch.DeviceInfo.MacName;
			// airSwitchInfo.DeviceEpointName = airSwitch.DeviceInfo.DeviceName;
			// airSwitchInfo.ImgVersion = airSwitch.DeviceInfo.ImgVersion;
			// airSwitchInfo.HwVersion = airSwitch.DeviceInfo.HwVersion;
			// airSwitchInfo.IsOnline = airSwitch.DeviceInfo.IsOnline;
			// airSwitchInfo.DriveCode = airSwitch.DeviceInfo.DriveCode;
			// airSwitchInfo.IasDeviceType = airSwitch.DeviceInfo.DeviceType;
			// airSwitchInfo.Profile = airSwitch.DeviceInfo.Profile;
			// airSwitchInfo.ImgTypeId = airSwitch.DeviceInfo.ImgTypeId;
			// airSwitchInfo.InClusterList = airSwitch.DeviceInfo.InClusterList;
			// airSwitchInfo.OutClusterList = airSwitch.DeviceInfo.OutClusterList;
			// airSwitchInfo.AttributeStatus = airSwitch.DeviceInfo.AttributeStatus;
			// airSwitchInfo.DeviceInfo = airSwitch.DeviceInfo;
			// // airSwitchInfo.ReSave();
			// }
			// DebugPrintLog($"UI收到通知后的主题_{ topic}");

			// break;
			//case DeviceType.WindowCoveringDevice:
			// var windowCovering = new Rollershade() { DeviceID = jobject.Value<int>((object)"Device_ID"), DeviceAddr = jobject.Value<string>((object)"DeviceAddr"), DeviceEpoint = jobject.Value<int>((object)"Epoint"), DataID = jobject.Value<int>((object)"Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			// windowCovering.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade.DeviceInfoData>(jobject["Data"].ToString());
			// if (windowCovering.DeviceInfo == null)
			// {
			// return;
			// }
			// var wc = DeviceList.Find(obj => obj.DeviceID == windowCovering.DeviceID && obj.DeviceAddr == windowCovering.DeviceAddr && obj.DeviceEpoint == windowCovering.DeviceEpoint);
			// if (wc == null)
			// {
			// DeviceList.Add(windowCovering);
			// windowCovering.DeviceName = windowCovering.DeviceInfo.MacName;
			// windowCovering.DeviceEpointName = windowCovering.DeviceInfo.DeviceName;
			// windowCovering.ImgVersion = windowCovering.DeviceInfo.ImgVersion;
			// windowCovering.HwVersion = windowCovering.DeviceInfo.HwVersion;
			// windowCovering.IsOnline = windowCovering.DeviceInfo.IsOnline;
			// windowCovering.DriveCode = windowCovering.DeviceInfo.DriveCode;
			// windowCovering.IasDeviceType = windowCovering.DeviceInfo.DeviceType;
			// windowCovering.Profile = windowCovering.DeviceInfo.Profile;
			// windowCovering.ImgTypeId = windowCovering.DeviceInfo.ImgTypeId;
			// windowCovering.InClusterList = windowCovering.DeviceInfo.InClusterList;
			// windowCovering.OutClusterList = windowCovering.DeviceInfo.OutClusterList;
			// windowCovering.AttributeStatus = windowCovering.DeviceInfo.AttributeStatus;
			// //windowCovering.Save();
			// }
			// else
			// {
			// wc.DeviceName = windowCovering.DeviceInfo.MacName;
			// wc.DeviceEpointName = windowCovering.DeviceInfo.DeviceName;
			// wc.DeviceInfo = windowCovering.DeviceInfo;
			// wc.ImgVersion = windowCovering.DeviceInfo.ImgVersion;
			// wc.HwVersion = windowCovering.DeviceInfo.HwVersion;
			// wc.IsOnline = windowCovering.DeviceInfo.IsOnline;
			// wc.DriveCode = windowCovering.DeviceInfo.DriveCode;
			// wc.IasDeviceType = windowCovering.DeviceInfo.DeviceType;
			// wc.Profile = windowCovering.DeviceInfo.Profile;
			// wc.ImgTypeId = windowCovering.DeviceInfo.ImgTypeId;
			// wc.InClusterList = windowCovering.DeviceInfo.InClusterList;
			// wc.OutClusterList = windowCovering.DeviceInfo.OutClusterList;
			// wc.AttributeStatus = windowCovering.DeviceInfo.AttributeStatus;
			// // wc.ReSave();
			// }
			// DebugPrintLog($"UI收到通知后的主题_{ topic}");
			// break;
			//case DeviceType.IASZone:
			// var ias = new IASZone() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			// ias.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.DeviceInfoData>(jobject["Data"].ToString());
			// if (ias.DeviceInfo == null)
			// {
			// return;
			// }
			// var infoIAS = DeviceList.Find(obj => obj.DeviceID == ias.DeviceID && obj.DeviceAddr == ias.DeviceAddr && obj.DeviceEpoint == ias.DeviceEpoint);
			// if (infoIAS == null)
			// {
			// DeviceList.Add(ias);
			// ias.DeviceName = ias.DeviceInfo.MacName;
			// ias.DeviceEpointName = ias.DeviceInfo.DeviceName;
			// ias.ImgVersion = ias.DeviceInfo.ImgVersion;
			// ias.HwVersion = ias.DeviceInfo.HwVersion;
			// ias.IsOnline = ias.DeviceInfo.IsOnline;
			// ias.DriveCode = ias.DeviceInfo.DriveCode;
			// ias.IasDeviceType = ias.DeviceInfo.DeviceType;
			// ias.Profile = ias.DeviceInfo.Profile;
			// ias.ImgTypeId = ias.DeviceInfo.ImgTypeId;
			// ias.InClusterList = ias.DeviceInfo.InClusterList;
			// ias.OutClusterList = ias.DeviceInfo.OutClusterList;
			// ias.AttributeStatus = ias.DeviceInfo.AttributeStatus;
			// //ias.Save();
			// }
			// else
			// {
			// infoIAS.DeviceName = ias.DeviceInfo.MacName;
			// infoIAS.DeviceEpointName = ias.DeviceInfo.DeviceName;
			// infoIAS.DeviceEpointName = ias.DeviceInfo.DeviceName;
			// infoIAS.ImgVersion = ias.DeviceInfo.ImgVersion;
			// infoIAS.HwVersion = ias.DeviceInfo.HwVersion;
			// infoIAS.IsOnline = ias.DeviceInfo.IsOnline;
			// infoIAS.DriveCode = ias.DeviceInfo.DriveCode;
			// infoIAS.IasDeviceType = ias.DeviceInfo.DeviceType;
			// infoIAS.Profile = ias.DeviceInfo.Profile;
			// infoIAS.ImgTypeId = ias.DeviceInfo.ImgTypeId;
			// infoIAS.InClusterList = ias.DeviceInfo.InClusterList;
			// infoIAS.OutClusterList = ias.DeviceInfo.OutClusterList;
			// infoIAS.AttributeStatus = ias.DeviceInfo.AttributeStatus;
			// infoIAS.DeviceInfo = ias.DeviceInfo;
			// //ias.ReSave();
			// }
			// DebugPrintLog($"UI收到通知后的主题_{ topic}");
			// break;
			//case DeviceType.OtaDevice:
			//case DeviceType.OtaPanelDevice:
			//var ota = new OTADevice() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			//ota.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceInfoData>(jobject["Data"].ToString());
			//if (ota.DeviceInfo == null)
			//{
			// return;
			//}
			//var infoOta = DeviceList.Find(obj => obj.DeviceID == ota.DeviceID && obj.DeviceAddr == ota.DeviceAddr && obj.DeviceEpoint == ota.DeviceEpoint);
			//if (infoOta == null)
			//{
			// DeviceList.Add(ota);
			// ota.DeviceName = ota.DeviceInfo.MacName;
			// ota.DeviceEpointName = ota.DeviceInfo.DeviceName;
			// ota.ImgVersion = ota.DeviceInfo.ImgVersion;
			// ota.HwVersion = ota.DeviceInfo.HwVersion;
			// ota.IsOnline = ota.DeviceInfo.IsOnline;
			// ota.DriveCode = ota.DeviceInfo.DriveCode;
			// ota.IasDeviceType = ota.DeviceInfo.DeviceType;
			// ota.Profile = ota.DeviceInfo.Profile;
			// ota.ImgTypeId = ota.DeviceInfo.ImgTypeId;
			// ota.InClusterList = ota.DeviceInfo.InClusterList;
			// ota.OutClusterList = ota.DeviceInfo.OutClusterList;
			// ota.AttributeStatus = ota.DeviceInfo.AttributeStatus;
			// //ota.Save();
			//}
			//else
			//{
			// infoOta.DeviceName = ota.DeviceInfo.MacName;
			// infoOta.DeviceEpointName = ota.DeviceInfo.DeviceName;
			// infoOta.DeviceEpointName = ota.DeviceInfo.DeviceName;
			// infoOta.ImgVersion = ota.DeviceInfo.ImgVersion;
			// infoOta.HwVersion = ota.DeviceInfo.HwVersion;
			// infoOta.IsOnline = ota.DeviceInfo.IsOnline;
			// infoOta.DriveCode = ota.DeviceInfo.DriveCode;
			// infoOta.IasDeviceType = ota.DeviceInfo.DeviceType;
			// infoOta.Profile = ota.DeviceInfo.Profile;
			// infoOta.ImgTypeId = ota.DeviceInfo.ImgTypeId;
			// infoOta.InClusterList = ota.DeviceInfo.InClusterList;
			// infoOta.OutClusterList = ota.DeviceInfo.OutClusterList;
			// infoOta.AttributeStatus = ota.DeviceInfo.AttributeStatus;
			// infoOta.DeviceInfo = ota.DeviceInfo;
			// //ota.ReSave();
			//}
			//DebugPrintLog($"UI收到通知后的主题_{ topic}");
			//break;
			//case DeviceType.Thermostat:
			//var thermostat = new ThermostatObj() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
			//thermostat.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ThermostatObj.DeviceInfoData>(jobject["Data"].ToString());
			//if (thermostat.DeviceInfo == null)
			//{
			// return;
			//}
			//var ther = gateway.DeviceList.Find(obj => obj.DeviceID == thermostat.DeviceID && obj.DeviceAddr == thermostat.DeviceAddr && obj.DeviceEpoint == thermostat.DeviceEpoint);
			//if (ther == null)
			//{
			// gateway.DeviceList.Add(thermostat);
			// thermostat.DeviceName = thermostat.DeviceInfo.DeviceName;
			// IO.LocalFileUtils.SaveDeviceInfo(thermostat, thermostat.DeviceEpoint.ToString());
			//}
			//else
			//{
			// ther.DeviceName = thermostat.DeviceInfo.DeviceName;
			// ther.DeviceInfo = thermostat.DeviceInfo;
			// ZigBee.IO.LocalFileUtils.SaveDeviceInfo(ther, ther.DeviceEpoint.ToString());
			//}
			//break;
			//case DeviceType.TemperatureSensor:
			//var temperatureSensor = new TemperatureSensor() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
			//temperatureSensor.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor.DeviceInfoData>(jobject["Data"].ToString());
			//if (temperatureSensor.DeviceInfo == null)
			//{
			// return;
			//}
			//var ts = gateway.DeviceList.Find(obj => obj.DeviceID == temperatureSensor.DeviceID && obj.DeviceAddr == temperatureSensor.DeviceAddr && obj.DeviceEpoint == temperatureSensor.DeviceEpoint);
			//if (ts == null)
			//{
			// gateway.DeviceList.Add(temperatureSensor);
			// temperatureSensor.DeviceName = temperatureSensor.DeviceInfo.DeviceName;
			// IO.LocalFileUtils.SaveDeviceInfo(temperatureSensor, temperatureSensor.DeviceEpoint.ToString());
			//}
			//else
			//{
			// ts.DeviceName = temperatureSensor.DeviceInfo.DeviceName;
			// ts.DeviceInfo = temperatureSensor.DeviceInfo;
			// IO.LocalFileUtils.SaveDeviceInfo(ts, ts.DeviceEpoint.ToString());
			//}
			//break;

			}
			}
			else if (topic == gatewayID + "/" + "DeviceInfoResponEnd")
			{
			canBreak = true;
			}
			};

			Actions += action;
			DebugPrintLog("DeviceInfo Actions 启动" + "_" + System.DateTime.Now.ToString());

			try
			{
			var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 93 } };
			Send("GetDeviceInfo", jObject.ToString());
			}
			catch { }

			while (canBreak == false && (DateTime.Now - dateTime).TotalMilliseconds < 6000)
			{
			await System.Threading.Tasks.Task.Delay(10);
			}

			Actions -= action;
			DebugPrintLog("DeviceInfo_Actions 退出" + System.DateTime.Now.ToString());
			return DeviceList;
			}));
			}
			#endregion

			#region 获取网关记录的设备属性状态
			/// <summary>
			///获取网关记录的设备属性状态
			/// </summary>
			public async System.Threading.Tasks.Task<GetStatusRecordAllInfo> GetStatusRecordAsync(string deviceAddr, int deviceEpoint)
			{
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			GetStatusRecordAllInfo 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			d = new GetStatusRecordAllInfo { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			d = new GetStatusRecordAllInfo { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "GetStatusRecord_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			gatewayTemp.getStatusRecordInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GetStatusRecordInfo>(jobject["Data"].ToString());

			if (gatewayTemp.getStatusRecordInfo == null)
			{
			d = new GetStatusRecordAllInfo { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new GetStatusRecordAllInfo { getStatusRecordInfo = gatewayTemp.getStatusRecordInfo };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			};
			Actions += action;
			DebugPrintLog("GetStatusRecord_Actions 启动" + System.DateTime.Now.ToString());
			try
			{
			var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 80 } };
			Send("GetStatusRecord", 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 GetStatusRecordAllInfo { errorMessageBase = " 回复超时，请重新操作" };
			}
			Actions -= action;
			DebugPrintLog("GetStatusRecord_Actions 退出" + System.DateTime.Now.ToString());

			return d;
			});
			}
			#endregion

			#region 允许设备入网
			///<summary >
			/// 搜索新入网的设备（允许设备入网）
			@@ -1132,7 +539,6 @@
			{
			await System.Threading.Tasks.Task.Run(async () =>
			{
			CommonDevice commonDev = null;
			Action<string, string> action1 = (topic, message) => { };
			Actions += action1;
			var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 94 } };
			@@ -1187,8 +593,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1196,13 +601,12 @@
			}
			else
			{
			d = new GwLinuxResetResponData { errorMessageBase = ErrorMess(temp.Error) };
			d = new GwLinuxResetResponData { errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "GwLinuxReset_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"].ToString());

			if (result == null)
			@@ -1265,8 +669,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1274,13 +677,12 @@
			}
			else
			{
			d = new GwRebootResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new GwRebootResponAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "GwReboot_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"].ToString());

			if (result == null)
			@@ -1341,8 +743,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1350,22 +751,21 @@
			}
			else
			{
			d = new SaveNVFileResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new SaveNVFileResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (gatewayTemp.zbGwOperationSaveNVFileData == null)
			if (zbGwOperationSaveNVFileData == null)
			{
			d = new SaveNVFileResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new SaveNVFileResponseAllData { saveNVFileResponseData = gatewayTemp.zbGwOperationSaveNVFileData };
			d = new SaveNVFileResponseAllData { saveNVFileResponseData = zbGwOperationSaveNVFileData };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			@@ -1419,8 +819,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1428,14 +827,13 @@
			}
			else
			{
			d = new RestoreNVAllDtta { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new RestoreNVAllDtta { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}


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

			if (tempData == null)
			@@ -1499,21 +897,19 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
			if (temp == null)
			{
			d = new GwGetChannelResponData { errorMessageBase = "网关错误回复，且数据是空" };
			}
			else
			{
			d = new GwGetChannelResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new GwGetChannelResponData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "ZbGw/GetChannel_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			var channel = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Channel"].ToString());
			d = new GwGetChannelResponData { channel = channel };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			@@ -1567,8 +963,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1576,13 +971,12 @@
			}
			else
			{
			d = new ChangeChannelResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new ChangeChannelResponAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (tempInfo == null)
			@@ -1661,8 +1055,11 @@
			/// </summary>
			public async System.Threading.Tasks.Task<Panel.PanelSwitchLevelInfo> ClientDataPassthroughBytesAsync(string deviceAddr, int devicePoint, long dataLength, byte[] passData)
			{
			var myDevice = Shared.Common.LocalDevice.Current.GetDevice(deviceAddr, devicePoint);

			Panel.PanelSwitchLevelInfo result = null;
			if (Gateway == null)

			if (myDevice.Gateway == null)
			{
			result = new Panel.PanelSwitchLevelInfo { errorMessageBase = "当前没有网关" };
			return result;
			@@ -1676,8 +1073,7 @@

			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());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1686,24 +1082,23 @@

			else
			{
			result = new Panel.PanelSwitchLevelInfo { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			result = new Panel.PanelSwitchLevelInfo { errorResponData = temp, errorMessageBase = CommonDevice.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());
			var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());

			if (gatewayTemp.clientDataPassthroughResponseData == null)
			if (clientDataPassthroughResponseData == null)
			{
			result = new Panel.PanelSwitchLevelInfo { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
			if (clientDataPassthroughResponseData?.PassData != null)
			{
			var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
			var data = clientDataPassthroughResponseData.PassData;
			if (data.Length == 14)
			{
			var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
			@@ -1720,7 +1115,7 @@
			}
			};

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

			try
			@@ -1761,7 +1156,7 @@
			{
			result = new Panel.PanelSwitchLevelInfo { errorMessageBase = " 回复超时，请重新操作" };
			}
			Gateway.Actions -= action;
			myDevice.Gateway.Actions -= action;
			System.Console.WriteLine("ClientDataPassthrough_Actions 退出" + System.DateTime.Now.ToString());

			return result;
			@@ -1790,8 +1185,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1799,24 +1193,16 @@
			}
			else
			{
			d = new PassthroughAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new PassthroughAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "ZbDataPassthrough")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(jobject["Data"].ToString());

			if (gatewayTemp.getGwVersion == null)
			{
			d = new PassthroughAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new PassthroughAllData { passData = temp };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			d = new PassthroughAllData { passData = temp };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			};
			Actions += action;
			@@ -1869,8 +1255,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1879,13 +1264,12 @@

			else
			{
			d = new LinuxUpgradeAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new LinuxUpgradeAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "ZbGwOperation/LinuxUpgrade_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
			d = new LinuxUpgradeAllData { Result = result };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			@@ -1946,8 +1330,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -1956,22 +1339,21 @@

			else
			{
			d = new ZbGwOperationUpgradeAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new ZbGwOperationUpgradeAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (gatewayTemp.zbGwOperationUpgradeData == null)
			if (zbGwOperationUpgradeData == null)
			{
			d = new ZbGwOperationUpgradeAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new ZbGwOperationUpgradeAllData { bGwOperationUpgradeData = gatewayTemp.zbGwOperationUpgradeData };
			d = new ZbGwOperationUpgradeAllData { bGwOperationUpgradeData = zbGwOperationUpgradeData };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			@@ -2017,11 +1399,11 @@
			/// <returns>The file async.</returns>
			/// <param name="distributedMark">Distributed mark:固件唯一标识</param>
			/// <param name="imageName">Image name:固件版本</param>
			public async System.Threading.Tasks.Task<DownloadFileResponAllData> DownloadFileAsync(string distributedMark, string imageName)
			public async System.Threading.Tasks.Task<CommonDevice.DownloadFileResponAllData> DownloadFileAsync(string distributedMark, string imageName)
			{
			return await System.Threading.Tasks.Task.Run(async () =>
			{
			DownloadFileResponAllData d = null; ;
			CommonDevice.DownloadFileResponAllData d = null; ;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			@@ -2029,32 +1411,30 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

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

			else
			{
			d = new DownloadFileResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new CommonDevice.DownloadFileResponAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (gatewayTemp.downloadFileResponData == null)
			if (downloadFileResponData == null)
			{
			d = new DownloadFileResponAllData { errorMessageBase = "网关返回的数据为空" };
			d = new CommonDevice.DownloadFileResponAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new DownloadFileResponAllData { downloadFileResponData = gatewayTemp.downloadFileResponData };
			d = new CommonDevice.DownloadFileResponAllData { downloadFileResponData = downloadFileResponData };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			@@ -2085,7 +1465,7 @@
			}
			if ((DateTime.Now - dateTime).TotalMilliseconds > 30 * 1000)
			{
			d = new DownloadFileResponAllData { errorMessageBase = " 回复超时，请重新操作" };
			d = new CommonDevice.DownloadFileResponAllData { errorMessageBase = " 回复超时，请重新操作" };

			}
			Actions -= action;
			@@ -2112,8 +1492,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2122,22 +1501,21 @@

			else
			{
			d = new CheckVDDriveCodeResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new CheckVDDriveCodeResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (gatewayTemp.vDriveDriveCodeResponData == null)
			if (vDriveDriveCodeResponData == null)
			{
			d = new CheckVDDriveCodeResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new CheckVDDriveCodeResponseAllData { vDriveDriveCodeResponData = gatewayTemp.vDriveDriveCodeResponData };
			d = new CheckVDDriveCodeResponseAllData { vDriveDriveCodeResponData = vDriveDriveCodeResponData };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			}
			}
			@@ -2192,8 +1570,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2202,22 +1579,21 @@

			else
			{
			d = new VirtualDriveUpgradeResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			d = new VirtualDriveUpgradeResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

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

			if (gatewayTemp.virtualDriveUpgradeResponData == null)
			if (virtualDriveUpgradeResponData == null)
			{
			d = new VirtualDriveUpgradeResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			d = new VirtualDriveUpgradeResponseAllData { virtualDriveUpgradeResponData = gatewayTemp.virtualDriveUpgradeResponData };
			d = new VirtualDriveUpgradeResponseAllData { virtualDriveUpgradeResponData = virtualDriveUpgradeResponData };
			DebugPrintLog($"UI收到通知后的主题_{topic}");
			}
			}
			@@ -2255,115 +1631,6 @@

			#endregion

			//#region 上传私有数据
			//private bool backupSuccess = false;
			/// <summary>
			/// 上传私有数据
			/// </summary>
			/// <returns>The data to gateway.</returns>
			/// <param name="fileName">File name.</param>
			/// <param name="dev">Dev.</param>
			//public async System.Threading.Tasks.Task<SendFileResponseAllData> BackupDataToGateway(string fileName, CommonDevice dev)
			//{
			// return await System.Threading.Tasks.Task.Run(async () =>
			// {
			// SendFileResponseAllData backUpStatus = null;
			// var file = await System.Threading.Tasks.Task.Factory.StartNew(() => Newtonsoft.Json.JsonConvert.SerializeObject(dev));
			// var data = System.Text.Encoding.UTF8.GetBytes(file);
			// //网关中创建存储数据的文件
			// var saveFileName = await dev.Gateway.CreateFileAsync(fileName);
			// if (saveFileName != null && saveFileName.Result == 0)
			// {
			// backupSuccess = false;
			// //上传数据到网关
			// var saveData = await dev.Gateway.SendFileAsync(data);
			// if (saveData != null)
			// {
			// backUpStatus = new SendFileResponseAllData { Result = saveData.Result };
			// }
			// }
			// var dateTime = DateTime.Now;
			// while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
			// {
			// await System.Threading.Tasks.Task.Delay(10);
			// if (backUpStatus != null)
			// {
			// break;
			// }
			// }
			// if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
			// {
			// backUpStatus = new SendFileResponseAllData { errorMessageBase = " 回复超时，请重新操作" };
			// };
			// return backUpStatus;
			// });
			//}

			/// <summary>
			/// 下载私有数据
			/// </summary>
			/// <returns>The data from gateway.</returns>
			/// <param name="fileName">File name.</param>
			/// <param name="dev">Dev.</param>
			//public async System.Threading.Tasks.Task<System.Collections.Generic.List<byte>> DownloadDataFromGateway(string fileName, CommonDevice dev)
			//{
			// return await System.Threading.Tasks.Task.Run(async () =>
			// {
			// byteSource.Clear();
			// System.Collections.Generic.List<byte> backUpData = null;
			// var dateTime = DateTime.Now;
			// //获取当前文件的具体信息
			// //var getFileSize = await currentKey.Gateway.GetCurrentFileInfoAsync(fileName);
			// //下载文件
			// var saveFileName = await dev.Gateway.SetDownloadFileAsync(fileName);
			// Action<string, byte[]> action = (topic, dataContent) =>
			// {
			// if (topic.Split('/')[0] + "/" + topic.Split('/')[1] + "/" + topic.Split('/')[2] == topic.Split('/')[0] + "/" + "FileTransfer/DownloadFile")
			// {
			// dateTime = DateTime.Now;
			// byte[] fileBytes = dataContent;
			// if (fileBytes[5] != 1)
			// {
			// if (fileBytes.Length == 2056)
			// {
			// var tempBytes = new byte[2048];
			// System.Array.Copy(fileBytes, 8, tempBytes, 0, 2048);
			// byteSource.AddRange(tempBytes);
			// }
			// else
			// {
			// var tempBytes = new byte[fileBytes.Length - 8];
			// System.Array.Copy(fileBytes, 8, tempBytes, 0, tempBytes.Length);
			// byteSource.AddRange(tempBytes);
			// }
			// }
			// else
			// {
			// var tempBytes = new byte[fileBytes.Length - 8];
			// System.Array.Copy(fileBytes, 8, tempBytes, 0, tempBytes.Length);
			// byteSource.AddRange(tempBytes);

			// if (byteSource != null )
			// {
			// backUpData = byteSource;
			// }
			// }

			// }
			// };
			// dev.Gateway.FileContentAction += action;

			// while ((DateTime.Now - dateTime).TotalMilliseconds < 2000)
			// {
			// await System.Threading.Tasks.Task.Delay(10);
			// }
			// dev.Gateway.FileContentAction -= action;
			// return byteSource;
			// });
			//}

			//#endregion

			#region 客户端上传文件到网关.
			/// <summary>
			/// 客户端上传文件到网关
			@@ -2384,8 +1651,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2393,13 +1659,12 @@
			}
			else
			{
			dataRes = new CreateFileResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			dataRes = new CreateFileResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "FileTransfer/CreateFile_Respon")
			{
			var security = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
			dataRes = new CreateFileResponseAllData { Result = result };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			@@ -2463,7 +1728,6 @@

			if (topic == gatewayID + "/FileTransfer/SendFile_Respon")
			{
			var gateway = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
			dataRes = new SendFileResponseAllData { Result = result };
			if (result == 0)
			@@ -2553,8 +1817,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2562,13 +1825,12 @@
			}
			else
			{
			dataRes = new FileTransferLsDiResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			dataRes = new FileTransferLsDiResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "FileTransfer/lsDir_Respon")
			{
			var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var resultlsDir = Newtonsoft.Json.JsonConvert.DeserializeObject<FileTransferLsDiResponseData>(jobject["Data"].ToString());
			if (resultlsDir != null)
			{
			@@ -2631,8 +1893,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2640,13 +1901,12 @@
			}
			else
			{
			dataRes = new FileTransferGetFileInfoResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			dataRes = new FileTransferGetFileInfoResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "FileTransfer/GetFileInfo_Respon")
			{
			var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var resultlsDir = Newtonsoft.Json.JsonConvert.DeserializeObject<FileTransferGetFileInfoResponseData>(jobject["Data"].ToString());
			if (resultlsDir != null)
			{
			@@ -2711,8 +1971,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2720,13 +1979,12 @@
			}
			else
			{
			dataRes = new SetDownloadFileResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			dataRes = new SetDownloadFileResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "FileTransfer/SetDownloadFile_Respon")
			{
			var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = CurrentGateWayId };
			var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetDownloadFileResponseData>(jobject["Data"].ToString());
			if (tempData != null)
			{
			@@ -2734,7 +1992,7 @@
			var tempDa = new SetDownloadFileResponseData();
			if (tempData.Result == 0)
			{
			ZbGateway.byteSource.Clear();
			this.byteSource.Clear();
			}
			tempDa.Result = tempData.Result;
			dataRes.setDownloadFileResponseData = tempDa;
			@@ -2782,7 +2040,7 @@
			#endregion

			#region 网关发送文件流到客户端
			static System.Collections.Generic.List<byte> byteSource = new System.Collections.Generic.List<byte>();
			private List<byte> byteSource = new List<byte>();
			///<summary >
			/// 下载文件中的数据
			/// </summary>
			@@ -2845,8 +2103,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2854,13 +2111,12 @@
			}
			else
			{
			dataRes = new DelFileOrDirResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			dataRes = new DelFileOrDirResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "FileTransfer/DelFileOrDir_Respon")
			{
			var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = CurrentGateWayId };
			var resultDelFileOrDir = Newtonsoft.Json.JsonConvert.DeserializeObject<DelFileOrDirResponseData>(jobject["Data"].ToString());
			if (resultDelFileOrDir != null)
			{
			@@ -2924,8 +2180,7 @@

			if (topic == gatewayID + "/" + "Error_Respon")
			{
			var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

			if (temp == null)
			{
			@@ -2933,13 +2188,12 @@
			}
			else
			{
			dataRes = new CreateDirResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
			dataRes = new CreateDirResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
			}
			}

			if (topic == gatewayID + "/" + "FileTransfer/CreateDir_Respon")
			{
			var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = CurrentGateWayId };
			var resultCreateDir = Newtonsoft.Json.JsonConvert.DeserializeObject<CreateDirResponseData>(jobject["Data"].ToString());
			if (resultCreateDir != null)
			{
			@@ -3000,7 +2254,6 @@
			if (topic == gatewayID + "/" + "SendAESKey_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
			sendKeyResponData = new SendKeyResponData { Result = result };
			DebugPrintLog($"UI收到通知后的主题_{ topic}");
			@@ -3045,23 +2298,7 @@
			/// <para>进入当前界面时要添加</para>
			/// <para>退出当前界面时要关闭</para>
			/// </summary>
			public static readonly System.Collections.Generic.List<IStatus> StatusList = new System.Collections.Generic.List<IStatus>();

			/// <summary>
			/// 设备状态更新
			/// </summary>
			/// <param name="commonDevice">Common device.</param>
			public static void UpdateDeviceStatus(CommonDevice commonDevice)
			{
			if (commonDevice == null)
			{
			return;
			}
			for (int i = 0; i < StatusList.Count; i++)
			{
			StatusList[i].Changed(commonDevice);
			}
			}
			public static readonly List<IStatus> StatusList = new List<IStatus>();

			/// <summary>
			/// 设备信息变化
			@@ -3091,6 +2328,7 @@
			/// </summary>
			IMqttClient localMqttClient = new MqttFactory().CreateMqttClient();
			bool localMqttIsConnecting;
			[Newtonsoft.Json.JsonIgnore]
			public bool localIsConnected;
			/// <summary>
			/// 手机标识
			@@ -3162,7 +2400,6 @@
			{
			DebugPrintLog($" 本地连接成功_网关IP:{brokerName}_网关是否加:{IsEncry}_当前密码:{Password}");
			IsRemote = false;
			Shared.Phone.UserCenter.HdlGatewayLogic.Current.CheckGatewayByConnectChanged(Shared.Phone.UserCenter.GatewayConnectMode.WIFI);
			});
			}

			@@ -3174,14 +2411,14 @@
			{
			if (localMqttClient.Options == null)
			{
			var options = new MQTTnet.Client.Options.MqttClientOptionsBuilder().WithClientId(currentGuid.ToString())
			.WithTcpServer(brokerName, 1883)
			.WithKeepAlivePeriod(TimeSpan.FromSeconds(20))
			.WithCleanSession()
			//.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
			.WithCredentials("", "")
			.Build();
			await localMqttClient.ConnectAsync(options, CancellationToken.None);
			var options = new MQTTnet.Client.Options.MqttClientOptionsBuilder()//MQTT连接参数填充
			.WithClientId(currentGuid.ToString())//客户端ID
			.WithTcpServer(brokerName, 1883)//TCP服务端 1883 ，即MQTT服务端
			.WithCredentials("", "")//"", "")//凭证帐号密码
			.WithCommunicationTimeout(new TimeSpan(0, 0, 60)) //重连超时时间，默认5s
			.WithKeepAlivePeriod(new TimeSpan(0, 0, 15)) //保持连接时间，默认5s，心跳包
			.Build();//
			await localMqttClient.ConnectAsync(options);
			}
			else
			{
			@@ -3212,23 +2449,21 @@
			});
			}

			class GateWayBaseInfomation
			{
			//public string GatewayUniqueId;//"Emq网关1", <!-- 网关Mac -->
			public bool MqttOnlineStatus;//: true, <!-- 网关在云端Emq是否在线 -->
			public string AesKey;// : "a5d8da8a-ddea-48", <!-- 与此网关在云端Emq通信时，负载加解的16位Aes密钥 -->
			public string MacMark;//: "61eaa0ea-4812-4a7a-86d6-3098c61e64ed" <!-- 网关对应的唯一码 -->
			}
			/// <summary>
			/// 当前有帐号下所有的网关列表及信息
			/// </summary>
			static Dictionary<string, GateWayBaseInfomation> GateWayBaseInfomations = new Dictionary<string, GateWayBaseInfomation> { };
			public static Dictionary<string, Shared.Phone.UserCenter.GatewayResult> GateWayBaseInfomations = new Dictionary<string, Shared.Phone.UserCenter.GatewayResult> { };
			/// <summary>
			/// 获取当前帐号所有的网关信息
			/// </summary>
			/// <returns></returns>
			static async System.Threading.Tasks.Task initGateWayBaseInfomation()
			{
			if (AllowRemoteCtrl == false)
			{
			//没有远程连接的权限
			return;
			}
			string loginToken = Config.Instance.Token;
			if (Config.Instance.Home.IsOthreShare == true)
			{
			@@ -3271,11 +2506,13 @@
			var statuCode = jobject["StateCode"].ToString();
			if (statuCode != "Success")
			{
			//Log出力
			Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, "接口访问失败★：App/GetSingleHomeGatewayPagger " + statuCode);
			//序列化对象
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra2);
			Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, "参数：\r\n" + requestJson);
			//Log出力
			string errorMsg = "接口访问失败★：App/GetSingleHomeGatewayPagger " + statuCode + "\r\n";
			errorMsg += "参数：\r\n" + requestJson;
			Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, errorMsg);
			return;
			}

			var responseData = jobject["ResponseData"];
			@@ -3286,7 +2523,7 @@
			var list = JArray.Parse(responseData["PageData"].ToString());
			foreach (var v in list)
			{
			GateWayBaseInfomations[v["GatewayUniqueId"].ToString()] = new GateWayBaseInfomation { AesKey = v["AesKey"].ToString(), MacMark = v["MacMark"].ToString(), MqttOnlineStatus = bool.Parse(v["MqttOnlineStatus"].ToString()) };
			GateWayBaseInfomations[v["GatewayUniqueId"].ToString()] = new Shared.Phone.UserCenter.GatewayResult { AesKey = v["AesKey"].ToString(), MacMark = v["MacMark"].ToString(), MqttOnlineStatus = bool.Parse(v["MqttOnlineStatus"].ToString()) };
			//if (RemoteMqttClient.IsConnected)
			{
			await RemoteMqttClient.SubscribeAsync($"/ZigbeeGateWayToClient/{v["MacMark"].ToString()}/#", MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce);
			@@ -3306,15 +2543,12 @@
			/// 外网的MQTT是否正在连接
			/// </summary>
			static bool remoteMqttIsConnecting;
			static bool IsLoginAgain;

			/// <summary>
			/// 远程MqttClient
			/// </summary>
			public static IMqttClient RemoteMqttClient= new MqttFactory().CreateMqttClient();
			static bool remoteIsConnected;
			private int IsLogin = 0;
			[Newtonsoft.Json.JsonIgnore]
			static Action actionTemp;
			public static IMqttClient RemoteMqttClient = new MqttFactory().CreateMqttClient();
			static bool remoteIsConnected;

			/// <summary>
			/// 启动远程Mqtt
			@@ -3323,10 +2557,12 @@
			/// <param name="brokerName">Broker name.</param>
			public static async System.Threading.Tasks.Task StartRemoteMqtt()
			{
			if (remoteMqttIsConnecting
			\|\| !Shared.Common.Config.Instance.IsLogin
			\|\| Shared.Common.Config.Instance.HomeId == ""
			\|\| remoteIsConnected)
			//追加：没有远程连接的权限
			if (AllowRemoteCtrl == false
			\|\| remoteMqttIsConnecting
			\|\| !Shared.Common.Config.Instance.IsLogin
			\|\| Shared.Common.Config.Instance.HomeId == ""
			\|\| remoteIsConnected)
			{
			return;
			}
			@@ -3344,10 +2580,20 @@
			if (RemoteMqttClient.ApplicationMessageReceivedHandler == null)
			{
			RemoteMqttClient.UseApplicationMessageReceivedHandler((e) =>
			{
			if (!RemoteMqttClient.IsConnected \|\| !IsRemote)
			{
			return;
			{
			//这里是特殊的主题
			if (e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze"//踢人下线
			\|\| e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/Deleted"//分享删除
			\|\| e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/DeletedShareData"//分享删除
			\|\| e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/Update"//成员权限变更
			\|\| e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Home.Id + "_" + Config.Instance.Guid + "/PrimaryUserDelYou")//子账号被删除
			{
			mqttRemoteClient_MqttMsgPublishReceived(e);
			return;
			}
			if (!RemoteMqttClient.IsConnected \|\| !IsRemote)
			{
			return;
			}
			mqttRemoteClient_MqttMsgPublishReceived(e);
			});
			@@ -3367,15 +2613,31 @@
			RemoteMqttClient.UseConnectedHandler(async (e) =>
			{
			DebugPrintLog($"远程连接成功");

			if (Config.Instance.Home.IsOthreShare == true)
			{
			//订阅一个成员被删除的主题
			string myGuid = Config.Instance.Guid;
			await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/Deleted");
			//订阅一个分享数据已经变更的主题
			await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/DeletedShareData");
			//订阅一个子账号被删除的主题
			await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.Home.Id + "_" + myGuid + "/PrimaryUserDelYou");
			//订阅一个成员权限已经变更的主题
			await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/Update");
			}
			//订阅一个挤下线的主题
			await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze");

			await initGateWayBaseInfomation();
			Shared.Phone.UserCenter.HdlGatewayLogic.Current.CheckGatewayByConnectChanged(Shared.Phone.UserCenter.GatewayConnectMode.Remote);

			//没有主网关时主动读取，获取主网关信息
			var gateWayList = GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
			if (gateWayList.Find(obj => obj.getGatewayBaseInfo.IsMainGateWay == true) == null)
			var gateWayList = GateWayList.FindAll(obj => obj.HomeId == Shared.Common.Config.Instance.HomeId);
			if (gateWayList.Find(obj => obj.IsMainGateWay == true) == null)
			{
			if (gateWayList.Count == 1)
			{
			gateWayList[0].getGatewayBaseInfo.IsMainGateWay = true;
			gateWayList[0].IsMainGateWay = true;
			}
			else
			{
			@@ -3391,13 +2653,13 @@
			{
			for (int j = 0; j < gateWayList.Count; j++)
			{
			if (gateWayList[i].getGatewayBaseInfo.gwID == info.getGwData.GwId)
			if (gateWayList[i].GwId == info.getGwData.GwId)
			{
			gateWayList[i].getGatewayBaseInfo.IsMainGateWay = true;
			gateWayList[i].IsMainGateWay = true;
			}
			else
			{
			gateWayList[i].getGatewayBaseInfo.IsMainGateWay = false;
			gateWayList[i].IsMainGateWay = false;
			}
			}
			break;
			@@ -3421,7 +2683,9 @@
			["RequestVersion"] = CommonPage.RequestVersion,
			["RequestSource"] = 0,
			["LoginAccessToken"] = Config.Instance.Token,
			["RequestProtocolType"] = 0
			["RequestProtocolType"] = 0,
			["PlatformStr"] = "h",//这两个值如果不设置,则云端不发布主题
			["PublishPayloadJsonStr"] = "1"
			};
			var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
			result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
			@@ -3436,7 +2700,9 @@
			["LoginAccessToken"] = Config.Instance.Token,
			["RequestProtocolType"] = 0,
			["MainUserDistributedMark"] = Config.Instance.Home.MainUserDistributedMark,
			["HomeId"] = Config.Instance.Home.Id
			["HomeId"] = Config.Instance.Home.Id,
			["PlatformStr"] = "h",//这两个值如果不设置,则云端不发布主题
			["PublishPayloadJsonStr"] = "1"
			};
			var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
			result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);
			@@ -3444,6 +2710,15 @@
			if (result != null)
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(Encoding.UTF8.GetString(result));
			if (jobject["StateCode"].ToString() == "NotAllowRemoteCtrl")
			{
			//没有远程连接的权限
			AllowRemoteCtrl = false;
			return;
			}
			//虽然不知道对挤下线那一块有没有用,不过先这么弄
			await System.Threading.Tasks.Task.Delay(1500);

			var responseData = jobject["ResponseData"];
			if (responseData != null)
			{
			@@ -3451,6 +2726,8 @@
			var connEmqClientId = responseData["ConnEmqClientId"]?.ToString();
			var connEmqUserName = responseData["ConnEmqUserName"]?.ToString();
			var connEmqPwd = responseData["ConnEmqPwd"]?.ToString();
			//记录起当前的客户端ID
			Config.Instance.ConnEmqClientId = connEmqClientId;

			var connEmqDomainPorts = connEmqDomainPort.Replace("//", "").Split(':');
			var domain = connEmqDomainPorts[1];
			@@ -3496,7 +2773,8 @@
			{
			localIsConnected = false;
			DebugPrintLog($"Local主动断开_{s}");
			await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);
			//await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);
			await localMqttClient.DisconnectAsync();
			}
			}
			catch (Exception ex)
			@@ -3508,7 +2786,7 @@
			/// <summary>
			/// 断开远程Mqtt的链接
			/// </summary>
			public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s="")
			public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s = "")
			{
			try
			{
			@@ -3516,15 +2794,19 @@
			{
			remoteIsConnected = false;
			DebugPrintLog($"Remote主动断开_{s}");
			await RemoteMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);
			//await RemoteMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);
			await RemoteMqttClient.DisconnectAsync();
			}
			}
			catch(Exception e) {
			catch (Exception e)
			{
			DebugPrintLog($"Remote断开通讯连接出异常:{e.Message}");
			}
			}

			#endregion

			#region 数据发送

			/// <summary>
			/// 发送消息到服务器
			@@ -3556,11 +2838,11 @@
			{
			try
			{
			if (this.getGatewayBaseInfo?.gwID == null \|\| !GateWayBaseInfomations.ContainsKey(this.getGatewayBaseInfo?.gwID))
			if (this.GwId == string.Empty \|\| !GateWayBaseInfomations.ContainsKey(this.GwId))
			{
			return;
			}
			var gateWayBaseInfomation = GateWayBaseInfomations[this.getGatewayBaseInfo?.gwID];
			var gateWayBaseInfomation = GateWayBaseInfomations[this.GwId];
			message = SecuritySet.AesEncryptBytes(message, gateWayBaseInfomation.AesKey);
			var topicEncStr = $"/ClientToZigbeeGateWay/{gateWayBaseInfomation.MacMark}/Common/{topicName}";
			//(6)构建Mqtt需要发布的数据包,发布给云端的MqttBroker
			@@ -3605,11 +2887,11 @@
			if (IsRemote)
			{
			await SendRemoteMsg(topic, message, retain);
			DebugPrintLog($"远程——发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_当前网关{CurrentGateWayId}");//{System.DateTime.Now.ToString()}");// DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")
			DebugPrintLog($"远程——发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}");//{System.DateTime.Now.ToString()}");// DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")
			}
			else
			{
			DebugPrintLog($"局域网——发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_当前网关{CurrentGateWayId} 是否加密:{IsEncry}");
			DebugPrintLog($"局域网——发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_是否加密:{IsEncry}");

			if (IsEncry)
			{
			@@ -3625,14 +2907,14 @@
			{
			await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
			}
			catch(Exception e)
			catch (Exception e)
			{
			DebugPrintLog($"Local主动断开_{e.Message}");
			await DisConnectLocalMqttClient(e.Message);
			await StartLocalMqtt("ReConnect");
			if (localIsConnected)
			{
			DebugPrintLog($"局域网——二次发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_当前网关{CurrentGateWayId} 是否加密:{IsEncry}");
			DebugPrintLog($"局域网——二次发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_是否加密:{IsEncry}");
			await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
			}
			}
			@@ -3677,7 +2959,7 @@
			return;
			}

			DebugPrintLog($"局域网——发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_当前网关{CurrentGateWayId} 是否加密:{IsEncry}");
			DebugPrintLog($"局域网——发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_是否加密:{IsEncry}");

			if (IsEncry)
			{
			@@ -3700,7 +2982,7 @@
			await StartLocalMqtt("ReConnect");
			if (localIsConnected)
			{
			DebugPrintLog($"局域网——二次发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_当前网关{CurrentGateWayId} 是否加密:{IsEncry}");
			DebugPrintLog($"局域网——二次发送到网关的主题:{topic}_发送到网关的数据:{System.Text.Encoding.UTF8.GetString(message)}_是否加密:{IsEncry}");
			await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
			}
			}
			@@ -3712,13 +2994,9 @@
			}
			}

			[Serializable]
			public class CloudTimeResponse
			{
			public string StateCode;
			public string Info;
			public string CloudTimestamp;
			}
			#endregion

			#region 数据接收处理

			/// <summary>
			/// 接收远程数据处理
			@@ -3744,7 +3022,8 @@
			{
			return;
			}
			if (topics[2]== "NotifyGateWayInfoChange") {
			if (topics[2] == "NotifyGateWayInfoChange")
			{
			initGateWayBaseInfomation();
			return;
			}
			@@ -3830,7 +3109,7 @@
			/// <param name="topic">Topic.</param>
			/// <param name="message">Message.</param>
			/// <param name="e">E.</param>
			static void ReceiveMessage(string topic, string message, byte []payload)
			static void ReceiveMessage(string topic, string message, byte[] payload)
			{
			try
			{
			@@ -3851,9 +3130,12 @@
			epoint = topic.Split('/')[3];
			cluID = topic.Split('/')[4];
			attrId = topic.Split('/')[5];
			}
			}

			//全局接收网关推送的的逻辑(为了执行速度,尽可能的别加耗时的操作)
			Shared.Phone.UserCenter.HdlGatewayReceiveLogic.Current.GatewayOverallMsgReceive(gatewayID, topic, reportStatus, message);

			var gwa = GateWayList.Find(obj => obj.getGatewayBaseInfo.gwID == gatewayID);
			var gwa = GateWayList.Find(obj => obj.GwId == gatewayID);
			if (gwa == null)
			{
			return;
			@@ -3865,7 +3147,6 @@
			}

			gwa.GwResDataAction?.Invoke(topic, message);
			gwa.CurrentGateWayId = gatewayID;

			var jobject = new Newtonsoft.Json.Linq.JObject();
			if (topic.Split('/')[0] + "/" + topic.Split('/')[1] == topic.Split('/')[0] + "/" + "FileTransfer")
			@@ -3884,9 +3165,6 @@
			jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			}

			//全局接收网关推送的的逻辑(为了执行速度,尽可能的别加耗时的操作)
			Shared.Phone.UserCenter.HdlGatewayReceiveLogic.Current.GatewayOverallMsgReceive(gatewayID, topic, reportStatus, jobject);

			#region 远程,主网关上报通知
			if (IsRemote)
			{
			@@ -3895,16 +3173,16 @@
			var gwData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GetGwData>(jobject["Data"].ToString());
			if (gwData != null)
			{
			var gwList = GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
			var gwList = GateWayList.FindAll(obj => obj.HomeId == Shared.Common.Config.Instance.HomeId);
			for (int i = 0; i < gwList.Count; i++)
			{
			if (gwList[i].getGatewayBaseInfo.gwID == gatewayID)
			if (gwList[i].GwId == gatewayID)
			{
			gwList[i].getGatewayBaseInfo.IsMainGateWay = true;
			gwList[i].IsMainGateWay = true;
			}
			else
			{
			gwList[i].getGatewayBaseInfo.IsMainGateWay = false;
			gwList[i].IsMainGateWay = false;
			}
			}
			}
			@@ -3912,136 +3190,23 @@
			}

			#endregion
			#region 设备新上报
			//步骤1）网关告知客户端有新设备加入zigbee网络。
			if (topic == gatewayID + "/" + "Device/DeviceJoinZbNet_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			gatewayTemp.deviceDeviceJoinZbNetResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceDeviceJoinZbNetResponData>(jobject["Data"].ToString());
			if (gatewayTemp.deviceDeviceJoinZbNetResponData == null)
			{
			return;
			}
			//上报类型通知
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("Device/DeviceJoinZbNet已经通知");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("Device/DeviceJoinZbNet", gatewayTemp);
			}
			}
			//步骤2）网关告知客户端获取新设备所有端点信息是否成功
			if (topic == gatewayID + "/" + "Device/IsGetEpointInfo_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			gatewayTemp.deviceIsGetEpointInfoResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceIsGetEpointInfoResponData>(jobject["Data"].ToString());
			if (gatewayTemp.deviceIsGetEpointInfoResponData == null)
			{
			return;
			}
			//上报类型通知
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("Device/IsGetEpointInfo已经通知");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("Device/IsGetEpointInfo", gatewayTemp);
			}
			}
			//步骤3）网关上报节点设备所有端点信息
			if (topic == gatewayID + "/" + "DeviceInComingRespon")
			{
			//新设备上报，重新发获取所有的设备
			var tempDevice = new CommonDevice() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			tempDevice.getNewDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.NewDeviceInfoData>(jobject["Data"].ToString());
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("DeviceInComingRespon已经通知");
			gwa.ReportAction("DeviceInComingRespon", tempDevice.getNewDeviceInfo);
			}
			UpdateDeviceInfo(tempDevice, "DeviceInComingRespon");
			UpdateDeviceStatus(gwa);
			}
			#endregion

			#region 设备在线状态更新反馈
			else if (topic == gatewayID + "/" + "OnlineStatusChange_Respon")
			{
			var tempDevice = new CommonDevice() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			tempDevice.IsOnline = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["IsOnline"].ToString());

			if (gwa.ReportAction != null)
			{
			DebugPrintLog("OnlineStatusChange已经通知");
			gwa.ReportAction("OnlineStatusChange", tempDevice);
			}
			var infoTempDevice = gwa.DeviceList.Find(obj => obj.DeviceID == tempDevice.DeviceID && obj.DeviceAddr == tempDevice.DeviceAddr);
			if (infoTempDevice == null)
			{
			gwa.DeviceList.Add(tempDevice);
			UpdateDeviceStatus(tempDevice);
			UpdateDeviceInfo(tempDevice, "OnlineStatusChange");
			}
			else
			{
			if (infoTempDevice.DeviceInfo != null)
			{
			infoTempDevice.DeviceInfo.IsOnline = infoTempDevice.IsOnline;
			}
			UpdateDeviceInfo(infoTempDevice, "OnlineStatusChange");
			UpdateDeviceStatus(infoTempDevice);
			}
			}
			#endregion
			#region 设备被删除上报
			else if (topic == gatewayID + "/" + "RemoveDeviceRespon")
			{
			var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			gatewayTemp.removeDeviceResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.RemoveDeviceResponseData>(jobject["Data"].ToString());

			if (gatewayTemp.removeDeviceResponseData != null)
			{
			try
			{
			if (gatewayTemp.removeDeviceResponseData.Result == 0)
			{
			foreach (var delD in gatewayTemp.removeDeviceResponseData.DeviceList)
			{
			var tempDevice = new CommonDevice() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			tempDevice.removeDeviceResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RemoveDeviceResponseData>(jobject["Data"].ToString());
			if (tempDevice.removeDeviceResponseData == null)
			{
			return;
			}
			else
			{
			UpdateDeviceStatus(tempDevice);
			UpdateDeviceInfo(tempDevice, "RemoveDeviceRespon");
			if (tempDevice.removeDeviceResponseData.Result == 0)
			{
			var infoTempDevice = gwa.DeviceList.Find((CommonDevice obj) => obj.DeviceID == tempDevice.DeviceID && obj.DeviceAddr == tempDevice.DeviceAddr && obj.DeviceEpoint == tempDevice.DeviceEpoint);
			if (infoTempDevice != null)
			{
			gwa.DeviceList.Remove(infoTempDevice);
			}
			}
			}
			}
			}
			}
			catch { }
			}
			}
			//2020.05.11 删除

			#endregion

			#region 设备状态上报
			else if (topic == gatewayID + "/" + "DeviceStatusReport" + "/" + addr + "/" + epoint + "/" + cluID + "/" + attrId)
			if (topic == gatewayID + "/" + "DeviceStatusReport" + "/" + addr + "/" + epoint + "/" + cluID + "/" + attrId)
			{
			var deviceID = jobject.Value<int>("Device_ID");
			var deviceAddr = jobject.Value<string>("DeviceAddr");
			var tempEpoint = jobject.Value<int>("Epoint");
			var dataId = jobject.Value<int>("Data_ID");

			var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint, DataID = dataId };
			var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint };
			tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(jobject["Data"].ToString());
			UpdateDeviceStatus(tempDevice);
			UpdateDeviceInfo(tempDevice, "DeviceStatusReport");
			}
			#endregion
			@@ -4052,7 +3217,7 @@
			switch ((DeviceType)(deviceID))
			{
			case DeviceType.DoorLock:
			var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.GwId };
			var OperatingEventNotificationDatad = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockOperatingEventNotificationCommand>(jobject["Data"].ToString());
			if (OperatingEventNotificationDatad != null)
			{
			@@ -4063,7 +3228,6 @@
			DebugPrintLog("DoorLockProgrammingEventNotificationCommand已经通知");
			gwa.ReportAction("DoorLockProgrammingEventNotificationCommand", doorLock);
			}
			UpdateDeviceStatus(doorLock);
			UpdateDeviceInfo(doorLock, "DoorLockProgrammingEventNotificationCommand");
			break;
			}
			@@ -4076,7 +3240,7 @@
			switch ((DeviceType)(deviceID))
			{
			case DeviceType.DoorLock:
			var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.GwId };
			var ProgrammingEventNotificationData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockProgrammingEventNotificationCommand>(jobject["Data"].ToString());
			if (ProgrammingEventNotificationData != null)
			{
			@@ -4087,41 +3251,21 @@
			DebugPrintLog("DoorLockProgrammingEventNotificationCommand已经通知");
			gwa.ReportAction("DoorLockProgrammingEventNotificationCommand", doorLock);
			}
			UpdateDeviceStatus(doorLock);
			UpdateDeviceInfo(doorLock, "DoorLockProgrammingEventNotificationCommand");
			break;
			}
			}
			}
			#endregion
			#region IAS安防信息上报
			else if (topic == gatewayID + "/" + "IASInfoReport")
			{
			var deviceID = jobject.Value<int>("Device_ID");
			switch ((DeviceType)(deviceID))
			{
			case DeviceType.IASZone:
			var ias = new IASZone() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			ias.iASInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.IASInfoData>(jobject["Data"].ToString());
			//上报类型通知，必需先调用，然后才有通知，否则是空不会通知的
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("IASInfoReport已经通知");
			//ias.Save();
			gwa.ReportAction("IASInfoReport", ias.iASInfo);
			}

			UpdateDeviceStatus(ias);
			UpdateDeviceInfo(ias, "IASInfoReport");
			break;
			}
			}

			//2020.05.11 删除

			#endregion
			#region 下载进度上报
			else if (topic == gatewayID + "/" + "DownloadFile_Progress")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			gatewayTemp.downloadFileProgressResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DownloadFileProgressResponData>(jobject["Data"].ToString());
			if (gatewayTemp.downloadFileProgressResponData == null)
			gwa.downloadFileProgressResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DownloadFileProgressResponData>(jobject["Data"].ToString());
			if (gwa.downloadFileProgressResponData == null)
			{
			return;
			}
			@@ -4129,15 +3273,13 @@
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("DownloadFileProgress");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("DownloadFileProgress", gatewayTemp);
			gwa.ReportAction("DownloadFileProgress", gwa);
			}
			}
			else if (topic == gatewayID + "/" + "ZbGwOperation/Upgrade_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			gatewayTemp.zbGwOperationUpgradeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGwOperationUpgradeData>(jobject["Data"].ToString());
			if (gatewayTemp.zbGwOperationUpgradeData == null)
			gwa.zbGwOperationUpgradeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGwOperationUpgradeData>(jobject["Data"].ToString());
			if (gwa.zbGwOperationUpgradeData == null)
			{
			return;
			}
			@@ -4145,16 +3287,14 @@
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("协调器升级百分比");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("CordinatorUpgradePercent", gatewayTemp);
			gwa.ReportAction("CordinatorUpgradePercent", gwa);
			}
			}
			else if (topic == gatewayID + "/" + "OTA/Schedule_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			gatewayTemp.oTAScheduleResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<OTAScheduleResponData>(jobject["Data"].ToString());
			gwa.oTAScheduleResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.OTAScheduleResponData>(jobject["Data"].ToString());

			if (gatewayTemp.oTAScheduleResponData == null)
			if (gwa.oTAScheduleResponData == null)
			{
			return;
			}
			@@ -4163,16 +3303,14 @@
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("节点设备升级百分比");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("DeviceUpgradePercent", gatewayTemp);
			gwa.ReportAction("DeviceUpgradePercent", gwa);
			}
			}
			else if (topic == gatewayID + "/" + "VirtualDrive/Upgrade_Respon")
			{
			var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
			gatewayTemp.virtualDriveUpgradeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VirtualDriveUpgradeResponData>(jobject["Data"].ToString());
			gwa.virtualDriveUpgradeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VirtualDriveUpgradeResponData>(jobject["Data"].ToString());

			if (gatewayTemp.virtualDriveUpgradeResponData == null)
			if (gwa.virtualDriveUpgradeResponData == null)
			{
			return;
			}
			@@ -4180,18 +3318,16 @@
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("虚拟驱动升级百分比");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("VirtualDriveUpgrade", gatewayTemp);
			gwa.ReportAction("VirtualDriveUpgrade", gwa);
			}
			}
			#endregion
			#region 重启网关系统
			else if (topic == gatewayID + "/" + "GwReboot_Respon")
			{
			var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID") };
			gatewayTemp.gwRebootResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<GwRebootResponData>(jobject["Data"].ToString());
			var gwRebootResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<GwRebootResponData>(jobject["Data"].ToString());

			if (gatewayTemp.gwRebootResponData == null)
			if (gwRebootResponData == null)
			{
			return;
			}
			@@ -4199,15 +3335,14 @@
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("GwReboot_Respon已经通知");
			gatewayTemp.CurrentGateWayId = gatewayID;//这里的CurrentGateWayId是当前新new ZbGateway的值
			gwa.ReportAction("GwReboot_Respon", gatewayTemp);
			gwa.ReportAction("GwReboot_Respon", gwRebootResponData);
			}
			}
			#endregion
			#region 防区被触发时报告
			else if (topic == gatewayID + "/" + "Security/ZoneTriggerReport")
			{
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
			ias.zoneTriggerReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.ZoneTriggerReportData>(jobject["Data"].ToString());

			if (ias.zoneTriggerReportData == null)
			@@ -4225,43 +3360,43 @@
			#region 逻辑被调用反馈
			else if (topic == gatewayID + "/" + "Logic/Execute_Respon")
			{
			var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
			logic.logicExecuteRespo = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic.ExecuteResponse>(jobject["Data"].ToString());
			//var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
			//logic.logicExecuteRespo = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic.ExecuteResponse>(jobject["Data"].ToString());

			if (logic.logicExecuteRespo == null)
			{
			return;
			}
			//上报类型通知
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("LogicExecuteReport已经通知");
			gwa.ReportAction("LogicExecuteReport", logic.logicExecuteRespo);
			}
			//if (logic.logicExecuteRespo == null)
			//{
			// return;
			//}
			////上报类型通知
			//if (gwa.ReportAction != null)
			//{
			// DebugPrintLog("LogicExecuteReport已经通知");
			// gwa.ReportAction("LogicExecuteReport", logic.logicExecuteRespo);
			//}
			}
			#endregion
			#region 时间点条件推迟执行
			else if (topic == gatewayID + "/" + "Logic/TimingWillArrive")
			{
			var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
			logic.timingWillArriveData = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic.TimingWillArriveData>(jobject["Data"].ToString());
			//var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
			//logic.timingWillArriveData = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic.TimingWillArriveData>(jobject["Data"].ToString());

			if (logic.timingWillArriveData == null)
			{
			return;
			}
			//上报类型通知
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("TimingWillArrive已经通知");
			gwa.ReportAction("TimingWillArrive", logic.timingWillArriveData);
			}
			//if (logic.timingWillArriveData == null)
			//{
			// return;
			//}
			////上报类型通知
			//if (gwa.ReportAction != null)
			//{
			// DebugPrintLog("TimingWillArrive已经通知");
			// gwa.ReportAction("TimingWillArrive", logic.timingWillArriveData);
			//}
			}
			#endregion
			#region 模式安防动作被最终激活时发送报警信息
			else if (topic == gatewayID + "/" + "Security/ModeTriggerReport")
			{
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
			ias.modeTriggerReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.ModeTriggerReportData>(jobject["Data"].ToString());
			if (ias.modeTriggerReportData == null)
			{
			@@ -4278,7 +3413,7 @@
			#region 通过外部方式布防撤防成功时报告息
			else if (topic == gatewayID + "/" + "Security/EnOrWithdrawSucceedReport")
			{
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
			ias.enOrWithdrawSucceedReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.EnOrWithdrawSucceedReportData>(jobject["Data"].ToString());
			if (ias.enOrWithdrawSucceedReportData == null)
			{
			@@ -4295,7 +3430,7 @@
			#region 胁迫密码撤防时短信推送
			else if (topic == gatewayID + "/" + "Security/PushTargetInfo")
			{
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
			var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
			ias.coercedPWDWithdrawReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.CoercedPWDWithdrawReportData>(jobject["Data"].ToString());
			if (ias.coercedPWDWithdrawReportData == null)
			{
			@@ -4309,42 +3444,22 @@
			}
			}
			#endregion
			#region 节点设备默认反馈
			else if (topic == gatewayID + "/" + "DeviceDefaultAck")
			{
			var deviceDefaultAck = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
			if (deviceDefaultAck == null)
			{
			return;
			}
			//上报类型通知
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("DeviceDefaultAck");
			gwa.ReportAction("DeviceDefaultAck", deviceDefaultAck);
			}
			}
			#endregion

			#region 设备请求APP获取升级数据
			else 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)
			{
			return;
			}

			//上报类型通知
			if (gwa.ReportAction != null)
			{
			DebugPrintLog("DeviceRequestAcUpdateData");
			gwa.ReportAction("DeviceRequestAcUpdateData", gatewayTemp.clientDataPassthroughResponseData);
			{
			var clientDataPassthrough = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
			if (clientDataPassthrough != null)
			{
			DebugPrintLog("DeviceRequestAcUpdateData");
			gwa.ReportAction("DeviceRequestAcUpdateData", clientDataPassthrough);
			}
			}
			}
			#endregion
			DebugPrintLog("网关返回数据通知");
			}
			catch (Exception ex)
			{
			@@ -4352,5 +3467,40 @@
			}

			}

			#endregion

			#region 保存缓存

			/// <summary>
			/// 重新保存设备
			/// </summary>
			public void ReSave()
			{
			Global.WriteFileByBytesByHomeId(FilePath, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
			}
			#endregion

			#region 调试打印

			/// <summary>
			/// 调试时打开打印信息，true:打印，false:不打印
			/// </summary>
			/// <param name="msg">Message.</param>
			/// <param name="flage">If set to <c>true</c> flage.</param>
			public static void DebugPrintLog(string msg, bool flage = true)
			{
			#if DEBUG
			if (flage == true)
			{
			//if (msg.Contains("DeviceStatusReport") == false)
			{
			System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
			}
			}
			#endif
			}

			#endregion
			}
			}