From 407fae6f07a2a982a2a814c2f145c40733c966cb Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 12 一月 2022 15:29:34 +0800 Subject: [PATCH] 2022-01-12 1.更新 --- Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 367 ---------------------------------------------------- 1 files changed, 3 insertions(+), 364 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs index 46332c8..bf2fc92 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs @@ -38,7 +38,7 @@ //public static Button LogoButton = new Button (); - public static string RequestVersion = "2.601071"; + public static string RequestVersion = "2.701111"; public static UserInfo LoginUser; /// <summary> /// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken) @@ -73,12 +73,7 @@ public static string WiFiStatus = "CrabtreeAdd/WiFi.png";//"CrabtreeAdd/WiFi.png"; public static string RegisterLogoString = "Logo/Register_logo.png"; public static string SeviceIP = "52.172.25.151"; - public static string RequestHttpsHost = "https://smarth-api.havells.com/HangZhouHdlCloudApi"; - //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi"; - //public static string RequestHttpsHostMqtt = "https://smarth-api.havells.com"; - - //public static string RequestHttpsHost = "https://developer.hdlcontrol.com"; #region GetDesignHeight /// <summary> @@ -141,6 +136,7 @@ } //鍗板害瀹㈡埛瀹氬埗APP榛樿浣跨敤鑻辨枃 Language.CurrentLanguage = "English"; + Shared.BusSocket.Start (6000); CommonPage.InitReceiveEvent (); @@ -205,364 +201,7 @@ }); } - static DateTime requesTime = DateTime.MinValue; - static bool isShowLoading = true; - ///// <summary> - ///// 璇锋眰鏈嶅姟鍣ㄦ柟娉� - ///// </summary> - ///// <returns>The https.</returns> - ///// <param name="methodType">璇锋眰鏂规硶.</param> - ///// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param> - ///// <param name="needHeaders">鏄惁闇�瑕佸寘澶�.</param> - //public static ResponsePack RequestHttpsOld (string methodType, string dataStringJson, string urlHead = "") - //{ - // ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => { - // return true; - // }; - - // #region - // var webClient = new WebClient (); - // if (urlHead == "") { - // urlHead = RequestHttpsHost; - // } - // //else { - // // webClient.Headers.Add ("CONTENT-TYPE", "application/json"); - // //} - // webClient.Headers.Add ("CONTENT-TYPE", "application/json"); - // string url = urlHead + methodType; - // if (LoginUser != null) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */ - // webClient.Headers.Add ("Authorization", LoginUser.LoginTokenString); - // } - // byte [] bytes = null; - // try { - // bytes = webClient.UploadData (url, Encoding.UTF8.GetBytes (dataStringJson)); - // } catch (System.Net.WebException webEx) { - // //Application.RunOnMainThread (() => { - // // MainPage.Loading.Hide (); - // //}); - // return new ResponsePack () { StateCode = ErrorCode.NetworkError }; - // } - // string responseString = Encoding.UTF8.GetString (bytes); - - // try { - // return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack> (responseString); - // } catch (Exception ex) { - // Utlis.WriteLine (ex.ToString ()); - // return new ResponsePack () { StateCode = "Data exception" }; - // } - // #endregion - - //} - - /// <summary> - /// 璇锋眰鏈嶅姟鍣ㄦ柟娉� - /// </summary> - /// <returns>The https.</returns> - /// <param name="methodType">璇锋眰鏂规硶.</param> - /// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param> - /// <param name="needHeaders">鏄惁闇�瑕佸寘澶�.</param> - public static byte [] RequestHttpsReturnByte (string methodType, string dataStringJson, bool needHeaders = false, string urlHead = "") - { - ResponsePack revertObj = null; - try { - - ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => { - return true; - }; - - #region - var webClient = new WebClient (); - if (urlHead == "") { - urlHead = RequestHttpsHost; - } - //else { - // webClient.Headers.Add ("CONTENT-TYPE", "application/json"); - //} - webClient.Headers.Add ("CONTENT-TYPE", "application/json"); - string url = urlHead + methodType; - if (needHeaders && LoginUser != null) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */ - webClient.Headers.Add ("Authorization", LoginUser.LoginTokenString); - } - byte [] bytes = null; - try { - bytes = webClient.UploadData (url, Encoding.UTF8.GetBytes (dataStringJson)); - } catch (System.Net.WebException webEx) { - return bytes; - } - - - return bytes; - #endregion - } catch (Exception ex) { - Utlis.WriteLine (ex.Message); - return null; - } finally { - //requesTime = requesTime.AddDays(1); - } - } - - - /// <summary> - /// 璇锋眰鏈嶅姟鍣ㄦ柟娉� - /// </summary> - /// <returns>The https.</returns> - /// <param name="methodType">璇锋眰鏂规硶.</param> - public static ResponsePack RequestHttpsNewBig (string methodType, byte [] byteData, UploadHomeAppGatewaySubFilesBigObj mUploadHomeAppGatewaySubFilesBigObj, string urlHead = "", int mTimeout = 10, string requestMethod = "POST") - { - ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => { - return true; - }; - #region HttpWebRequest - try { - - if (urlHead == "") { - urlHead = RequestHttpsHost; - } - string requestFullUrl = urlHead + methodType; - //鍒濆鍖栨柊鐨剋ebRequst - //1锛� 鍒涘缓httpWebRequest瀵硅薄 - HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create (new Uri (requestFullUrl)); - - //2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄 - webRequest.Method = requestMethod; - //webRequest.Timeout = mTimeout * 1000; - webRequest.Headers.Add (HttpRequestHeader.Authorization, LoginUser.LoginTokenString); - webRequest.Headers.Add ("RequestVersion", mUploadHomeAppGatewaySubFilesBigObj.RequestVersion); - webRequest.Headers.Add ("LoginAccessToken", LoginUser.LoginTokenString); - webRequest.Headers.Add ("HomeId", mUploadHomeAppGatewaySubFilesBigObj.HomeId); - webRequest.Headers.Add ("BackupClassId", mUploadHomeAppGatewaySubFilesBigObj.BackupClassId); - webRequest.Headers.Add ("FileName", mUploadHomeAppGatewaySubFilesBigObj.FileName); - webRequest.Headers.Add ("IsOtherAccountCtrl", mUploadHomeAppGatewaySubFilesBigObj.IsOtherAccountCtrl.ToString ()); - - //var byteData = new byte [] { }锛�//Encoding.UTF8.GetBytes (dataStringJson); - //if (LoginUser != null) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */ - // //瀵瑰簲寰俊缃戝潃 - - //} - - if (requestMethod == "GET") { - //webRequest.ContentType = "text/html"; - webRequest.ContentType = "application/json"; - } else { - webRequest.ContentType = "application/octet-stream"; - //webRequest.ContentType = "application/json"; - webRequest.ContentLength = byteData.Length; - - //3锛� 闄勫姞瑕丳OST缁欐湇鍔″櫒鐨勬暟鎹埌HttpWebRequest瀵硅薄(闄勫姞POST鏁版嵁鐨勮繃绋嬫瘮杈冪壒娈婏紝瀹冨苟娌℃湁鎻愪緵涓�涓睘鎬х粰鐢ㄦ埛瀛樺彇锛岄渶瑕佸啓鍏ttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰銆�) - var newStream = webRequest.GetRequestStream ();//鍒涘缓涓�涓猄tream,璧嬪�兼槸鍐欏叆HttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰 - newStream.Write (byteData, 0, byteData.Length); - newStream.Flush (); - newStream.Close (); - } - - //4锛� 璇诲彇鏈嶅姟鍣ㄧ殑杩斿洖淇℃伅 - var response = (HttpWebResponse)webRequest.GetResponse (); - using (var stream = response.GetResponseStream ()) { - if (stream == null) { - return new ResponsePack () { StateCode = ErrorCode.NetworkError }; - } - var ms = new MemoryStream (); - var bytes = new byte [1024]; - var len = int.MaxValue; - while (stream.CanRead && 0 < len) { - len = stream.Read (bytes, 0, bytes.Length); - ms.Write (bytes, 0, len); - } - //var backBytes = ms.ToArray (); - string responseString = Encoding.UTF8.GetString (ms.ToArray ()); - - try { - ResponsePack revertObj = new ResponsePack () { }; - revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack> (responseString); - if (revertObj.StateCode == null) { - revertObj.StateCode = "Data Exception"; - } - return revertObj; - } catch (Exception ex) { - Shared.Utlis.WriteLine (ex.ToString ()); - return new ResponsePack () { StateCode = "Data Exception" }; - } - - //return ms.ToArray (); - } - } catch (Exception ex) { -#if DEBUG - System.Console.WriteLine (ex.Message); -#endif - //The operation has timed out - return new ResponsePack () { StateCode = ErrorCode.NetworkError }; - } - - #endregion - - } - - /// <summary> - /// 璇锋眰鏈嶅姟鍣ㄦ柟娉� - /// 2020-06-22 甯﹁嚜瀹氫箟璇锋眰瓒呮椂 鏃堕棿鏂规硶 - /// </summary> - /// <returns>The https.</returns> - /// <param name="methodType">璇锋眰鏂规硶.</param> - /// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param> - /// <param name="needHeaders">鏄惁闇�瑕佸寘澶�.</param> - public static ResponsePack RequestHttps (string methodType, string dataStringJson, string urlHead = "", int mTimeout = 10, string requestMethod = "POST") - { - ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, error) => { - return true; - }; - - - #region HttpWebRequest - - try { - - if (urlHead == "") { - urlHead = RequestHttpsHost; - } - string requestFullUrl = urlHead + methodType; - - //鍒濆鍖栨柊鐨剋ebRequst - //1锛� 鍒涘缓httpWebRequest瀵硅薄 - HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create (new Uri (requestFullUrl)); - - //2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄 - webRequest.Method = requestMethod; - - webRequest.Timeout = mTimeout * 1000; - - var byteData = Encoding.UTF8.GetBytes (dataStringJson); - - if (LoginUser != null) {/* 濡傛灉涓嶉渶瑕侀獙璇乀oken鍙互涓嶇敤浼犲叆 */ - //瀵瑰簲寰俊缃戝潃 - webRequest.Headers.Add (HttpRequestHeader.Authorization, LoginUser.LoginTokenString); - } - if (requestMethod == "GET") { - //webRequest.ContentType = "text/html"; - webRequest.ContentType = "application/json"; - } else { - webRequest.ContentType = "application/json"; - webRequest.ContentLength = byteData.Length; - - //3锛� 闄勫姞瑕丳OST缁欐湇鍔″櫒鐨勬暟鎹埌HttpWebRequest瀵硅薄(闄勫姞POST鏁版嵁鐨勮繃绋嬫瘮杈冪壒娈婏紝瀹冨苟娌℃湁鎻愪緵涓�涓睘鎬х粰鐢ㄦ埛瀛樺彇锛岄渶瑕佸啓鍏ttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰銆�) - var newStream = webRequest.GetRequestStream ();//鍒涘缓涓�涓猄tream,璧嬪�兼槸鍐欏叆HttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰 - newStream.Write (byteData, 0, byteData.Length); - newStream.Flush (); - newStream.Close (); - } - - //4锛� 璇诲彇鏈嶅姟鍣ㄧ殑杩斿洖淇℃伅 - var response = (HttpWebResponse)webRequest.GetResponse (); - using (var stream = response.GetResponseStream ()) { - if (stream == null) { - return new ResponsePack () { StateCode = ErrorCode.NetworkError }; - } - var ms = new MemoryStream (); - var bytes = new byte [1024]; - var len = int.MaxValue; - while (stream.CanRead && 0 < len) { - len = stream.Read (bytes, 0, bytes.Length); - ms.Write (bytes, 0, len); - } - //var backBytes = ms.ToArray (); - string responseString = Encoding.UTF8.GetString (ms.ToArray ()); - - try { - ResponsePack revertObj = new ResponsePack () { }; - revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack> (responseString); - if (revertObj.StateCode == null) { - revertObj.StateCode = "Data Exception"; - } - return revertObj; - } catch (Exception ex) { - Shared.Utlis.WriteLine (ex.ToString ()); - return new ResponsePack () { StateCode = "Data Exception" }; - } - - //return ms.ToArray (); - } - } catch (Exception ex) { -#if DEBUG - System.Console.WriteLine (ex.Message); -#endif - //The operation has timed out - return new ResponsePack () { StateCode = ErrorCode.NetworkError }; - } - - #endregion - - } - - public const int TIME_OUT_20 = 30; - /// <summary> - /// 涓嬭浇鏂囦欢鏂规硶 - /// </summary> - /// <param name="methodType"></param> - /// <param name="dataStringJson"></param> - /// <param name="urlHead"></param> - /// <param name="mTimeout"></param> - /// <param name="requestMethod"></param> - /// <returns></returns> - public static byte [] RequestHttpsReturnByteNew (string methodType, string dataStringJson, string urlHead = "", int mTimeout = 20, string requestMethod = "POST") - { - try { - #region - if (urlHead == "") { - urlHead = RequestHttpsHost; - } - string requestFullUrl = urlHead + methodType; - - //鍒濆鍖栨柊鐨剋ebRequst - //1锛� 鍒涘缓httpWebRequest瀵硅薄 - HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create (new Uri (requestFullUrl)); - - //2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄 - webRequest.Method = requestMethod; - //webRequest.Timeout = timeout * 1000; - //鍙栨秷浣跨敤浠g悊璁块棶 - webRequest.Proxy = null; - webRequest.UseDefaultCredentials = false; - - if (requestMethod == "GET") { - webRequest.ContentType = "application/json"; - } else { - var byteData = Encoding.UTF8.GetBytes (dataStringJson); - webRequest.ContentType = "application/json"; - webRequest.ContentLength = byteData.Length; - //3锛� 闄勫姞瑕丳OST缁欐湇鍔″櫒鐨勬暟鎹埌HttpWebRequest瀵硅薄(闄勫姞POST鏁版嵁鐨勮繃绋嬫瘮杈冪壒娈婏紝瀹冨苟娌℃湁鎻愪緵涓�涓睘鎬х粰鐢ㄦ埛瀛樺彇锛岄渶瑕佸啓鍏ttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰銆�) - var newStream = webRequest.GetRequestStream ();//鍒涘缓涓�涓猄tream,璧嬪�兼槸鍐欏叆HttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰 - newStream.Write (byteData, 0, byteData.Length); - newStream.Flush (); - newStream.Close (); - } - - //4锛� 璇诲彇鏈嶅姟鍣ㄧ殑杩斿洖淇℃伅 - var response = (HttpWebResponse)webRequest.GetResponse (); - using (var stream = response.GetResponseStream ()) { - if (stream == null) { - return null; - } - var ms = new MemoryStream (); - var bytes = new byte [1024]; - var len = int.MaxValue; - while (stream.CanRead && 0 < len) { - len = stream.Read (bytes, 0, bytes.Length); - ms.Write (bytes, 0, len); - } - return ms.ToArray (); - } - #endregion - } catch (WebException e) { - //if (e.Status == WebExceptionStatus.ConnectFailure//鐢辨湁缃戠粶鍒囨崲鍒版棤缃戠粶鏃惰Е鍙� - // || e.Status == WebExceptionStatus.Timeout//瓒呮椂 - // || e.Status == WebExceptionStatus.NameResolutionFailure)//鏈韩灏辨槸鏃犵綉缁滄椂鍚姩鏃惰Е鍙� - //{ - // //Phone.UserCenter.HdlWifiLogic.Current.CanAccessHttp = false; - //} - return null; - } catch (Exception e) { - return null; - } - } + #region LoadingTipMsg 杩滅▼杩炴帴Tip -- Gitblit v1.8.0