~wjc/HomeApp.git

			@@ -22,9 +22,15 @@
			/// <param name="checkAuthority">是否检测权限，该参数不能省略</param>
			/// <param name="obj">一个类</param>
			/// <param name="listNotShowError">不需要显示错误的错误类别(接口返回的错误类别),如果包含，则会返回【true】</param>
			/// <param name="setAgain">当发送失败时,是否重发,默认重发</param>
			public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
			/// <param name="setAgain">当发送失败时,是否重发,默认不重发</param>
			public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
			{
			if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
			{
			//当前无法访问网络(当需要重新发送时,跳过这个判断)
			ShowNotNetMsg(listNotShowError);
			return false;
			}
			//获取接口的连接模式
			var connectMode = GetHttpConnectMode(checkAuthority);
			//获取从接口那里取到的比特数据
			@@ -33,8 +39,7 @@
			{
			if (setAgain == false)
			{
			//当前无法访问网络
			ShowNotNetMsg(listNotShowError);
			//不指定重发
			return false;
			}
			byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
			@@ -56,10 +61,17 @@
			/// <param name="checkAuthority">是否检测权限，该参数不能省略</param>
			/// <param name="obj">一个类</param>
			/// <param name="listNotShowError">不需要显示错误的错误类别(接口返回的错误类别),如果包含，则会返回【true】</param>
			/// <param name="setAgain">当发送失败时,是否重发,默认重发</param>
			/// <param name="setAgain">当发送失败时,是否重发,默认不重发</param>
			/// </param>
			public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
			public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
			{
			if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
			{
			//当前无法访问网络(当需要重新发送时,跳过这个判断)
			ShowNotNetMsg(listNotShowError);
			return "Error";
			}

			//获取接口的连接模式
			var connectMode = GetHttpConnectMode(checkAuthority);
			//获取从接口那里取到的比特数据
			@@ -68,8 +80,7 @@
			{
			if (setAgain == false)
			{
			//当前无法访问网络
			ShowNotNetMsg(listNotShowError);
			//不指定重发
			return "Error";
			}
			byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
			@@ -94,10 +105,16 @@
			/// <param name="checkAuthority">是否检测权限，该参数不能省略</param>
			/// <param name="obj">一个类</param>
			/// <param name="listNotShowError">不需要显示错误的错误类别(接口返回的错误类别),如果包含，则会返回【true】</param>
			/// <param name="setAgain">当发送失败时,是否重发,默认重发</param>
			/// <param name="setAgain">当发送失败时,是否重发,默认不重发</param>
			/// </param>
			public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
			public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
			{
			if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
			{
			//当前无法访问网络(当需要重新发送时,跳过这个判断)
			ShowNotNetMsg(listNotShowError);
			return null;
			}
			//获取接口的连接模式
			var connectMode = GetHttpConnectMode(checkAuthority);
			//获取从接口那里取到的比特数据
			@@ -106,8 +123,7 @@
			{
			if (setAgain == false)
			{
			//当前无法访问网络
			ShowNotNetMsg(listNotShowError);
			//不指定重发
			return null;
			}
			byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
			@@ -138,9 +154,15 @@
			/// <param name="checkAuthority">是否检测权限，该参数不能省略</param>
			/// <param name="obj">一个类</param>
			/// <param name="listNotShowError">不需要显示错误的错误类别(接口返回的错误类别),如果包含，则会返回【true】</param>
			/// <param name="setAgain">当发送失败时,是否重发,默认重发</param>
			public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
			/// <param name="setAgain">当发送失败时,是否重发,默认不重发</param>
			public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
			{
			if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
			{
			//当前无法访问网络(当需要重新发送时,跳过这个判断)
			ShowNotNetMsg(listNotShowError);
			return null;
			}
			//获取接口的连接模式
			var connectMode = GetHttpConnectMode(checkAuthority);
			//获取从接口那里取到的比特数据
			@@ -150,8 +172,7 @@
			{
			if (setAgain == false)
			{
			//当前无法访问网络
			ShowNotNetMsg(listNotShowError);
			//不指定重发
			return null;
			}
			revertObj = ResetByteRequestHttps(RequestName, checkAuthority, obj);
			@@ -516,7 +537,7 @@
			//断开远程Mqtt连接,重新连接
			HdlThreadLogic.Current.RunThread(async () =>
			{
			HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
			HdlGatewayLogic.Current.ClearAllRealGateway();
			await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
			}, ShowErrorMode.NO);
			}
			@@ -597,7 +618,7 @@

			//清空当前住宅id
			Config.Instance.HomeId = string.Empty;
			HdlGatewayLogic.Current.ClearAllRealGatewayConection(false);
			HdlGatewayLogic.Current.ClearAllRealGateway();

			//断开远程Mqtt连接
			HdlThreadLogic.Current.RunThread(async () =>
			@@ -653,8 +674,8 @@
			}
			else if (view is UserView.UserPage)
			{
			//刷新主页
			UserView.UserPage.Instance.ReFreshControl();
			var form = ((UserView.UserPage)view).GetNowActionForm();
			form?.FormActionAgainEvent();
			return;
			}
			else
			@@ -840,7 +861,7 @@
			//断开远程Mqtt连接,重新连接
			HdlThreadLogic.Current.RunThread(async () =>
			{
			HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
			HdlGatewayLogic.Current.ClearAllRealGateway();
			await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
			}, ShowErrorMode.NO);