~wjc/HomeApp.git

			@@ -15,11 +15,11 @@
			#region ■ 变量声明___________________________

			/// <summary>
			/// 备份业务的逻辑
			/// 网关业务的逻辑类
			/// </summary>
			private static HdlGatewayLogic m_Current = null;
			/// <summary>
			/// 备份业务的逻辑
			/// 网关业务的逻辑类
			/// </summary>
			public static HdlGatewayLogic Current
			{
			@@ -117,10 +117,20 @@
			{
			return;
			}

			List<string> listBackupGwId = new List<string>();
			var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
			if (fileData != null)
			{
			//新增：虽然概率低，但是确实发生了。如果有网络时，App重新绑定记录的网关失败的话
			//不应该删除它
			listBackupGwId = JsonConvert.DeserializeObject<List<string>>(System.Text.Encoding.UTF8.GetString(fileData));
			}

			List<string> listDelete = new List<string>();
			foreach (var gatewayId in this.dicGateway.Keys)
			{
			if (result.ContainsKey(gatewayId) == false)
			if (result.ContainsKey(gatewayId) == false && listBackupGwId.Contains(gatewayId) == false)
			{
			//本地存在云端不存在的网关，则删除
			listDelete.Add(gatewayId);
			@@ -132,8 +142,10 @@
			List<CommonDevice> list = Common.LocalDevice.Current.GetDeviceByGatewayID(gatewayId);
			foreach (var device in list)
			{
			//删除设备，不删除房间信息
			Common.LocalDevice.Current.DeleteMemmoryDevice(device, false);
			//删除一般设备
			Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);
			//删除Ota设备
			Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);
			}
			//删除网关文件
			this.DeleteGatewayFile(gatewayId);
			@@ -168,10 +180,18 @@
			/// <returns></returns>
			private ZbGateway GetGatewayFromFile(string file)
			{
			byte[] filebyte = Global.ReadFileByHomeId(file);
			string strvalue = System.Text.Encoding.UTF8.GetString(filebyte);
			var gateway = JsonConvert.DeserializeObject<ZbGateway>(strvalue);
			return gateway;
			try
			{
			byte[] filebyte = Global.ReadFileByHomeId(file);
			string strvalue = System.Text.Encoding.UTF8.GetString(filebyte);
			var gateway = JsonConvert.DeserializeObject<ZbGateway>(strvalue);
			return gateway;
			}
			catch (Exception ex)
			{
			HdlLogLogic.Current.WriteLog(ex);
			return null;
			}
			}

			#endregion
			@@ -179,20 +199,36 @@
			#region ■ 添加网关___________________________

			/// <summary>
			/// 添加新网关(仅限追加新的网关 1:正常 -1:异常 0:当前的网关绑定在了当前账号下的不同住宅里面)
			/// 添加新网关(仅限追加新的网关)
			/// </summary>
			/// <param name="zbGateway">网关</param>
			/// <param name="mode">是否显示错误</param>
			public async Task<int> AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
			public async Task<bool> AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
			{
			//执行添加网关到内存
			var result = await this.DoAddGatewayToMemory(zbGateway, mode);
			if (result != 1)
			//前的网关绑定在了当前账号下的不同住宅里面
			if (result == 0)
			{
			return result;
			if (mode == ShowErrorMode.YES)
			{
			//网关绑定在当前账号下的其他住宅里\r\n请解除绑定后再试
			string msg = Language.StringByID(R.MyInternationalizationString.uTheGatewayInOtherResidenceMsg);
			if (msg.Contains("{0}") == true)
			{
			msg = string.Format(msg, "\r\n");
			}
			this.ShowTipMsg(msg);
			}
			return false;
			}
			if (result == -1)
			{
			return false;
			}

			return 1;
			//设置网关的经纬度
			bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
			return falge;
			}

			/// <summary>
			@@ -391,6 +427,7 @@
			/// 重新绑定网关(1:正常 -1:异常 0:当前的网关绑定在了当前账号下的不同住宅里面)
			/// </summary>
			/// <param name="zbGateway">网关</param>
			/// <param name="btnMsg">消息控件</param>
			public async Task<int> ReBindNewGateway(ZbGateway zbGateway, NormalViewControl btnMsg = null)
			{
			if (zbGateway == null)
			@@ -398,6 +435,12 @@
			//错误:网关对象丢失
			string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
			this.ShowTipMsg(msg);
			return -1;
			}
			//设置网关的经纬度
			bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
			if (falge == false)
			{
			return -1;
			}

			@@ -437,7 +480,7 @@
			btnMsg.TextID = R.MyInternationalizationString.uGatewayDataIsChangingPleaseWhait;
			});
			}
			await System.Threading.Tasks.Task.Delay(8000);
			await Task.Delay(8000);

			//获取网关的信息
			var result = await zbGateway.GetZbGwInfoAsync();
			@@ -449,15 +492,7 @@
			return -1;
			}

			if (result == null)
			{
			//获取网关信息失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);
			this.ShowTipMsg(msg);
			return -1;
			}

			if (result.getGwData == null)
			if (result == null \|\| result.getGwData == null)
			{
			//获取网关信息失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);
			@@ -625,10 +660,10 @@
			}

			//获取全部设备
			bool result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);
			int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);
			//关闭进度条
			ProgressBar.Close();
			if (result == false)
			if (result == -1)
			{
			return false;
			}
			@@ -677,15 +712,15 @@
			bool result = await this.SetHomeIdToGateway(realWay, string.Empty);
			if (result == false)
			{
			//网关解绑失败
			//网关解绑失败不理它,因为网关可以按按键强制搜索得到
			string msg = Language.StringByID(R.MyInternationalizationString.uGatewayUnBindFail);
			this.ShowErrorMsg(msg);
			return false;
			//this.ShowErrorMsg(msg);
			//return false;
			}
			}

			//删除云端的网关
			await Phone.UserCenter.HdlGatewayLogic.Current.DeleteDataBaseGateway(zbGatewayID);
			await this.DeleteDataBaseGateway(zbGatewayID);

			//删除网关文件
			this.DeleteGatewayFile(zbGatewayID);
			@@ -693,7 +728,7 @@
			//移除
			ZbGateway.GateWayList.RemoveAll((obj) => this.GetGatewayId(obj) == zbGatewayID);
			//断开mqtt连接
			realWay.DisConnect("GD");
			realWay.DisConnectLocalMqttClient("GD");

			return true;
			}
			@@ -726,6 +761,8 @@
			{
			//删除设备文件
			Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);
			//删除Ota设备
			Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);
			}
			//如果是主网关
			if (this.IsMainGateway(zbGatewayID) == 1)
			@@ -1013,6 +1050,268 @@

			#endregion

			#region ■ 获取协调器当前信道_________________

			/// <summary>
			/// 获取协调器当前信道(会有等待延迟,返回-1代表错误)
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <returns></returns>
			public int GetGatewayChannelId(ZbGateway zbGateway)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			{
			//错误:网关对象丢失
			this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg));
			return -1;
			}
			int data = -1;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			if (topic == gatewayID + "/" + "ZbGw/GetChannel_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			data = Convert.ToInt32(jobject["Data"]["Channel"].ToString());
			}
			};
			realWay.Actions += action;

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 64512 }, { "Command", 8 } };
			realWay.Send("ZbGw/GetChannel", jObject.ToString());

			int TimeOut = 0;
			while (data == -1 && TimeOut < 30)
			{
			System.Threading.Thread.Sleep(100);
			TimeOut++;
			}

			realWay.Actions -= action;
			if (data == -1)
			{
			//获取协调器信道失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayChannelIdFail);
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			this.ShowTipMsg(msg);
			}

			return data;
			}

			#endregion

			#region ■ 获取协调器MAC______________________

			/// <summary>
			/// 获取协调器MAC地址(会有等待延迟,返回null代表错误)
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <returns></returns>
			public string GetGatewayCoordinatorMac(ZbGateway zbGateway)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			{
			//错误:网关对象丢失
			this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg));
			return null;
			}
			string data = null;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			if (topic == gatewayID + "/" + "ZbGw/GetMac_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			data = jobject["Data"]["MacAddr"].ToString();
			}
			};
			realWay.Actions += action;

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 64512 }, { "Command", 13 } };
			realWay.Send("ZbGw/GetMac", jObject.ToString());

			int TimeOut = 0;
			while (data == null && TimeOut < 30)
			{
			System.Threading.Thread.Sleep(100);
			TimeOut++;
			}

			realWay.Actions -= action;
			if (data == null)
			{
			//获取协调器Mac失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayCoordinatorMacFail);
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			this.ShowTipMsg(msg);
			}

			return data;
			}

			#endregion

			#region ■ 获取协调器PanID____________________

			/// <summary>
			/// 获取协调器PanID(会有等待延迟,返回-1代表错误)
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <returns></returns>
			public int GetGatewayPanId(ZbGateway zbGateway)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			{
			//错误:网关对象丢失
			this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg));
			return -1;
			}
			int panId = -1;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			if (topic == gatewayID + "/" + "ZbGw/GetPanId_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			panId = Convert.ToInt32(jobject["Data"]["PANID"].ToString());
			}
			};
			realWay.Actions += action;

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 64512 }, { "Command", 12 } };
			realWay.Send("ZbGw/GetPanId", jObject.ToString());

			int TimeOut = 0;
			while (panId == -1 && TimeOut < 30)
			{
			System.Threading.Thread.Sleep(100);
			TimeOut++;
			}

			realWay.Actions -= action;
			if (panId == -1)
			{
			//获取协调器PanID失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayPanIDFail);
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			this.ShowTipMsg(msg);
			}

			return panId;
			}

			#endregion

			#region ■ 网关自动备份设置___________________

			/// <summary>
			/// 获取网关自动备份设置(-1:异常 0:关闭 1:打开)
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <returns></returns>
			public int GetGatewayAutoBackupStatu(ZbGateway zbGateway)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			{
			//错误:网关对象丢失
			this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg));
			return -1;
			}
			int statu = -1;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			if (topic == gatewayID + "/GatewayAutoBackup_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			statu = Convert.ToInt32(jobject["Data"]["AutoBackupStatus"].ToString());
			}
			};
			realWay.Actions += action;

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 6205 } };
			var data = new Newtonsoft.Json.Linq.JObject { { "AutoBackup", 1 } };
			jObject.Add("Data", data);
			realWay.Send("GatewayAutoBackup", jObject.ToString());

			int TimeOut = 0;
			while (statu == -1 && TimeOut < 60)
			{
			System.Threading.Thread.Sleep(100);
			TimeOut++;
			}

			realWay.Actions -= action;
			if (statu == -1)
			{
			//获取网关自动备份设置失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayAutoBackupStatuFail);
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			this.ShowTipMsg(msg);
			}

			return statu;
			}

			/// <summary>
			/// 设置网关自动备份设置
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <param name="statu"></param>
			/// <returns></returns>
			public bool SetGatewayAutoBackupStatu(ZbGateway zbGateway, bool statu)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			{
			//错误:网关对象丢失
			this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg));
			return false;
			}
			int result = -1;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			if (topic == gatewayID + "/GatewayAutoBackup_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			result = Convert.ToInt32(jobject["Data"]["AutoBackupStatus"].ToString());
			}
			};
			realWay.Actions += action;

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 6205 } };
			var data = new Newtonsoft.Json.Linq.JObject { { "AutoBackup", statu == true ? 2 : 3 } };
			jObject.Add("Data", data);
			realWay.Send("GatewayAutoBackup", jObject.ToString());

			int TimeOut = 0;
			while (result == -1 && TimeOut < 60)
			{
			System.Threading.Thread.Sleep(100);
			TimeOut++;
			}

			realWay.Actions -= action;
			if (result == -1)
			{
			//设置网关自动备份失败
			string msg = Language.StringByID(R.MyInternationalizationString.uSetGatewayAutoBackupStatuFail);
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			this.ShowTipMsg(msg);
			return false;
			}

			return true;
			}

			#endregion

			#region ■ 获取网关GwInfo里面的属性___________

			/// <summary>
			@@ -1044,44 +1343,6 @@
			{
			//获取本地的属性
			objValue = localWay.getGwInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, localWay.getGwInfo, null);
			}

			if (objValue == null)
			{
			return defult;
			}
			return objValue;
			}

			/// <summary>
			/// 获取网关GatewayBaseInfo里面的属性
			/// </summary>
			/// <param name="zbGateway">网关对象</param>
			/// <param name="attributeName">GatewayBaseInfo里面属性的名字</param>
			/// <param name="defult">如果获取不到时，设置的默认值</param>
			/// <returns></returns>
			public object GetGatewayBaseInfoAttribute(ZbGateway zbGateway, string attributeName, string defult = "")
			{
			string gwID = this.GetGatewayId(zbGateway);
			var localWay = this.GetLocalGateway(gwID);

			object objValue = null;
			if (localWay == null \|\| localWay.getGatewayBaseInfo == null)
			{
			//本地没有记录有这个东西,则直接返回参数的数据
			if (zbGateway.getGatewayBaseInfo != null)
			{
			objValue = zbGateway.getGatewayBaseInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, zbGateway.getGatewayBaseInfo, null);
			}
			else
			{
			return defult;
			}
			}
			else
			{
			//获取本地属性
			objValue = localWay.getGatewayBaseInfo.GetType().InvokeMember(attributeName, System.Reflection.BindingFlags.GetField, null, localWay.getGatewayBaseInfo, null);
			}

			if (objValue == null)
			@@ -1318,7 +1579,7 @@
			//最后再断开mqtt连接
			for (int i = 0; i < list.Count; i++)
			{
			list[i].DisConnect("G");
			list[i].DisConnectLocalMqttClient("G");
			}
			list.Clear();
			}
			@@ -1592,51 +1853,15 @@
			return;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 85 } };
			realWay.Send("GwLinuxLocate_Respon", jObject.ToString());
			}

			#endregion

			#region ■ 一般方法___________________________

			/// <summary>
			/// 弹出网关不在线的
			/// </summary>
			private void ShowGatewayNotOnlineMsg()
			{
			Application.RunOnMainThread(() =>
			if (this.IsGatewayExist(zbGateway) == true)
			{
			//网关连接失败,请确认网络
			string msg = Language.StringByID(R.MyInternationalizationString.uGatewayIsNotLinkAndCheckNetwork);
			var control = new ShowMsgControl(ShowMsgType.Tip, msg);
			control.Show();
			});
			}

			/// <summary>
			/// 显示错误信息窗口
			/// </summary>
			/// <param name="msg"></param>
			private void ShowErrorMsg(string msg)
			{
			Application.RunOnMainThread(() =>
			realWay.Send("GwLinuxLocate_Respon", jObject.ToString());
			}
			else
			{
			var contr = new ShowMsgControl(ShowMsgType.Error, msg);
			contr.Show();
			});
			}

			/// <summary>
			/// 显示Tip信息窗口
			/// </summary>
			/// <param name="msg"></param>
			private void ShowTipMsg(string msg)
			{
			Application.RunOnMainThread(() =>
			{
			var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
			contr.Show();
			});
			//如果这个网关还没有绑定的话，则强制使用本地连接
			realWay.SendLocation("GwLinuxLocate_Respon", System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
			}
			}

			#endregion
			@@ -1842,17 +2067,19 @@
			{
			return;
			}
			//获取当前接受在线状态推送的界面
			var listForm = new List<CommonFormBase>();
			listForm.AddRange(UserCenterResourse.listGatewayOnlinePushForm);
			if (listForm.Count > 0)
			//保存当前激活的界面ID
			var listId = new List<string>();
			listId.AddRange(UserCenterResourse.listActionFormId);
			for (int i = 0; i < listId.Count; i++)
			{
			for (int i = 0; i < listChange.Count; i++)
			if (UserCenterResourse.DicActionForm.ContainsKey(listId[i]) == false)
			{
			foreach (var form in listForm)
			{
			form?.GatewayOnlinePush(listChange[i], listChangeStatu[i]);
			}
			continue;
			}
			//网关在线推送
			for (int j = 0; j < listChange.Count; j++)
			{
			UserCenterResourse.DicActionForm[listId[i]]?.GatewayOnlinePush(listChange[j], listChangeStatu[j]);
			}
			}
			}
			@@ -1923,7 +2150,7 @@
			bool canBreak = false;
			HdlThreadLogic.Current.RunThread(async () =>
			{
			List<string> list = new List<string>() { "NotSetAgain" };
			List<string> list = new List<string>() { "NotSetAgain", "NotCheck" };

			//设置访问接口的参数
			var pra = new GetGatewayPra();
			@@ -1966,6 +2193,82 @@

			#endregion

			#region ■ 设置网关经纬度_____________________

			/// <summary>
			/// 设置网关经纬度
			/// </summary>
			/// <param name="gateway">网关对象</param>
			/// <param name="Longitude">经度</param>
			/// <param name="Latitude">维度</param>
			/// <returns></returns>
			public bool SetGatewaySite(ZbGateway gateway, double Longitude, double Latitude)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, gateway) == false)
			{
			//错误:网关对象丢失
			string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
			this.ShowTipMsg(msg);
			return false;
			}

			int result = -1;
			Action<string, string> action = (topic, message) =>
			{
			var gatewayID = topic.Split('/')[0];
			if (topic == gatewayID + "/" + "Logic/SetSite_Respon")
			{
			var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			result = Convert.ToInt32(jobject["Data"]["Result"].ToString());
			}
			};
			realWay.Actions += action;
			//两位小数
			Longitude = Math.Round(Longitude, 2);
			Latitude = Math.Round(Latitude, 2);

			int intLongitude = Convert.ToInt32(Longitude.ToString().Replace(".", string.Empty));
			int intLatitude = Convert.ToInt32(Latitude.ToString().Replace(".", string.Empty));

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 2013 } };
			var data = new Newtonsoft.Json.Linq.JObject { { "Longitude", intLongitude }, { "Latitude", intLatitude } };
			jObject.Add("Data", data);
			if (this.IsGatewayExist(gateway) == true)
			{
			realWay.Send("Logic/SetSite", jObject.ToString());
			}
			else
			{
			//如果这个网关还没有绑定的话，则强制使用本地连接
			realWay.SendLocation("Logic/SetSite", System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
			}

			int TimeOut = 0;
			while (result == -1 && TimeOut < 30)
			{
			System.Threading.Thread.Sleep(100);
			TimeOut++;
			}

			realWay.Actions -= action;
			if (result != 0)
			{
			//设置网关经纬度失败
			string msg = Language.StringByID(R.MyInternationalizationString.uSetGatewaySiteFail);
			if (result == -1)
			{
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			}
			this.ShowTipMsg(msg);
			return false;
			}

			return true;
			}

			#endregion

			#region ■ 解绑云端网关_______________________

			/// <summary>
			@@ -1979,7 +2282,7 @@
			//获取控制主人账号的Token
			Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

			List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord" };
			List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotSetAgain" };

			bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
			if (result == false)
			@@ -2120,6 +2423,7 @@
			{
			//获取从云端那里得来的全部文件
			var listBackFile = HdlAutoBackupLogic.GetFileFromDirectory(UserCenterLogic.CombinePath(backDirectory));
			listBackFile.Sort();
			//添加附加情报:还原设备配置
			ProgressBar.SetAppendText(Language.StringByID(R.MyInternationalizationString.uRecoverDeviceSettion));
			ProgressBar.SetMaxValue(listBackFile.Count);
			@@ -2128,7 +2432,7 @@
			var listSaveFile = new HashSet<string>();
			foreach (string fileName in listBackFile)
			{
			if (fileName.Length < 10 \|\| fileName.StartsWith(Common.LocalDevice.deviceFirstName) == false)
			if (fileName.Length < 10 \|\| fileName.StartsWith("Device_") == false)
			{
			//不是设备备份文件
			continue;
			@@ -2188,7 +2492,7 @@
			if (deleteFile.Length > 12)
			{
			string deviceFileName = deleteFile.Substring(5);
			if (deviceFileName.StartsWith(Common.LocalDevice.deviceFirstName) == false)
			if (deviceFileName.StartsWith("Device_") == false)
			{
			//不是设备文件
			continue;
			@@ -2247,7 +2551,7 @@
			else if (backType == GatewayBackupEnum.APir灯光配置)
			{
			var recoverData = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.ConfigureParamates>(System.Text.Encoding.UTF8.GetString(byteData));
			result = await HdlDevicePirSensorLogic.Current.SetPirSensorLightSettion((IASZone)device, recoverData);
			result = await HdlDevicePirSensorLogic.Current.SetPirSensorSettion((IASZone)device, recoverData);
			}
			else if (backType == GatewayBackupEnum.A干接点颜色调节)
			{
			@@ -2269,23 +2573,117 @@
			int level = Convert.ToInt32(recoverData["level"]);
			result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode((Panel)device, modeEnable, modeTime, level);
			}
			else if (backType == GatewayBackupEnum.A干接点私有属性)
			else if (backType == GatewayBackupEnum.A干接点第三级别私有属性)
			{
			var recoverData = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(System.Text.Encoding.UTF8.GetString(byteData));
			result = await HdlDevicePanelLogic.Current.EditorDryContactFunction((Panel)device, recoverData);
			result = await HdlDevicePanelLogic.Current.EditorDryContactThirdFunction((Panel)device, recoverData);
			}
			else if (backType == GatewayBackupEnum.A窗帘方向)
			{
			var statu = Newtonsoft.Json.JsonConvert.DeserializeObject<bool>(System.Text.Encoding.UTF8.GetString(byteData));
			result = await HdlDeviceCurtainLogic.Current.SetCurtainDirection((Rollershade)device, statu);
			}
			else if (backType == GatewayBackupEnum.A窗帘手拉控制)
			{
			var statu = Newtonsoft.Json.JsonConvert.DeserializeObject<bool>(System.Text.Encoding.UTF8.GetString(byteData));
			result = await HdlDeviceCurtainLogic.Current.SetHandPullControl((Rollershade)device, statu);
			}
			else if (backType == GatewayBackupEnum.A窗帘上下限位)
			{
			var curtainDevice = (Rollershade)device;
			var recoverData = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(System.Text.Encoding.UTF8.GetString(byteData));
			int upLimit = Convert.ToInt32(recoverData["upLimit"]);
			int downLimit = Convert.ToInt32(recoverData["downLimit"]);
			//先重置窗帘
			result = await HdlDeviceCurtainLogic.Current.RestoreCurtain(curtainDevice);
			if (result == false) { return -1; }
			await Task.Delay(5000);
			//重置上限位
			result = await HdlDeviceCurtainLogic.Current.DeleteCurtainLimitPoint(curtainDevice, Rollershade.LimiType.UpLimit);
			if (result == false) { return -1; }
			//将窗帘调整到指定百分比
			curtainDevice.WcdGoToTiltValue(upLimit);
			await Task.Delay(3000);
			//执行确认及覆盖窗帘限位点
			result = await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit, -1, -1);
			if (result == false) { return -1; }

			await Task.Delay(2000);
			//重置下限位
			result = await HdlDeviceCurtainLogic.Current.DeleteCurtainLimitPoint(curtainDevice, Rollershade.LimiType.DownLimit);
			if (result == false) { return -1; }
			//将窗帘调整到指定百分比
			curtainDevice.WcdGoToTiltValue(downLimit);
			await Task.Delay(3000);
			//执行确认及覆盖窗帘限位点
			result = await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit, -1, -1);
			}
			else if (backType == GatewayBackupEnum.A空调自定义模式)
			{
			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(System.Text.Encoding.UTF8.GetString(byteData));
			result = await HdlDeviceAirConditionerLogic.Current.SetAcModeSupport((AC)device, data);
			if (result == true)
			{
			//转换为二进制
			var value = Convert.ToString(data, 2).PadLeft(16, '0');
			//这五个设置是放在后面的
			var fixValue = value.Substring(0, value.Length - 5);
			var reportValue = value.Substring(fixValue.Length);
			//更改缓存
			for (int i = 0; i < reportValue.Length; i++)
			{
			((AC)device).listSupportMode[i] = Convert.ToInt32(reportValue[i]);
			}
			device.ReSave();
			}
			}
			return result == true ? 1 : -1;
			}

			#endregion

			#region ■ 一般方法___________________________

			/// <summary>
			/// 弹出网关不在线的
			/// </summary>
			private void ShowGatewayNotOnlineMsg()
			{
			Application.RunOnMainThread(() =>
			{
			//网关连接失败,请确认网络
			string msg = Language.StringByID(R.MyInternationalizationString.uGatewayIsNotLinkAndCheckNetwork);
			var control = new ShowMsgControl(ShowMsgType.Tip, msg);
			control.Show();
			});
			}

			/// <summary>
			/// 显示错误信息窗口
			/// </summary>
			/// <param name="msg"></param>
			private void ShowErrorMsg(string msg)
			{
			Application.RunOnMainThread(() =>
			{
			var contr = new ShowMsgControl(ShowMsgType.Error, msg);
			contr.Show();
			});
			}

			/// <summary>
			/// 显示Tip信息窗口
			/// </summary>
			/// <param name="msg"></param>
			private void ShowTipMsg(string msg)
			{
			Application.RunOnMainThread(() =>
			{
			var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
			contr.Show();
			});
			}

			#endregion
			}
			}