新版本

黄学彪

2020-07-24 0087dd7734e71dfcfd1bb54db394ad7855021ffd

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -22,15 +22,9 @@
        /// <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 = false)

        /// <param name="setAgain">当发送失败时,是否重发,默认重发</param>

        public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)

        {

            if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)

            {

                //当前无法访问网络(当需要重新发送时,跳过这个判断)

                ShowNotNetMsg(listNotShowError);

                return false;

            }

            //获取接口的连接模式

            var connectMode = GetHttpConnectMode(checkAuthority);

            //获取从接口那里取到的比特数据

@@ -39,7 +33,8 @@
            {

                if (setAgain == false)

                {

                    //不指定重发

                    //当前无法访问网络

                    ShowNotNetMsg(listNotShowError);

                    return false;

                }

                byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);

@@ -61,17 +56,10 @@
        /// <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 = false)

        public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)

        {

            if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)

            {

                //当前无法访问网络(当需要重新发送时,跳过这个判断)

                ShowNotNetMsg(listNotShowError);

                return "Error";

            }



            //获取接口的连接模式

            var connectMode = GetHttpConnectMode(checkAuthority);

            //获取从接口那里取到的比特数据

@@ -80,7 +68,8 @@
            {

                if (setAgain == false)

                {

                    //不指定重发

                    //当前无法访问网络

                    ShowNotNetMsg(listNotShowError);

                    return "Error";

                }

                byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);

@@ -105,16 +94,10 @@
        /// <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 = false)

        public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)

        {

            if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)

            {

                //当前无法访问网络(当需要重新发送时,跳过这个判断)

                ShowNotNetMsg(listNotShowError);

                return null;

            }

            //获取接口的连接模式

            var connectMode = GetHttpConnectMode(checkAuthority);

            //获取从接口那里取到的比特数据

@@ -123,7 +106,8 @@
            {

                if (setAgain == false)

                {

                    //不指定重发

                    //当前无法访问网络

                    ShowNotNetMsg(listNotShowError);

                    return null;

                }

                byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);

@@ -154,15 +138,9 @@
        /// <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 = false)

        /// <param name="setAgain">当发送失败时,是否重发,默认重发</param>

        public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)

        {

            if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)

            {

                //当前无法访问网络(当需要重新发送时,跳过这个判断)

                ShowNotNetMsg(listNotShowError);

                return null;

            }

            //获取接口的连接模式

            var connectMode = GetHttpConnectMode(checkAuthority);

            //获取从接口那里取到的比特数据

@@ -172,7 +150,8 @@
            {

                if (setAgain == false)

                {

                    //不指定重发

                    //当前无法访问网络

                    ShowNotNetMsg(listNotShowError);

                    return null;

                }

                revertObj = ResetByteRequestHttps(RequestName, checkAuthority, obj);

@@ -537,7 +516,7 @@
            //断开远程Mqtt连接,重新连接

            HdlThreadLogic.Current.RunThread(async () =>

            {

                HdlGatewayLogic.Current.ClearAllRealGateway();

                HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);

                await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();

            }, ShowErrorMode.NO);

        }

@@ -618,7 +597,7 @@


                //清空当前住宅id

                Config.Instance.HomeId = string.Empty;

                HdlGatewayLogic.Current.ClearAllRealGateway();

                HdlGatewayLogic.Current.ClearAllRealGatewayConection(false);



                //断开远程Mqtt连接

                HdlThreadLogic.Current.RunThread(async () =>

@@ -674,8 +653,8 @@
                }

                else if (view is UserView.UserPage)

                {

                    var form = ((UserView.UserPage)view).GetNowActionForm();

                    form?.FormActionAgainEvent();

                    //刷新主页

                    UserView.UserPage.Instance.ReFreshControl();

                    return;

                }

                else

@@ -861,7 +840,7 @@
                //断开远程Mqtt连接,重新连接

                HdlThreadLogic.Current.RunThread(async () =>

                {

                    HdlGatewayLogic.Current.ClearAllRealGateway();

                    HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);

                    await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();

                }, ShowErrorMode.NO);