From 351bdda734832d821a9764b0cde8be5d83c4ec50 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 01 十二月 2022 09:56:25 +0800 Subject: [PATCH] 2022年12月01日09:56:23 --- ZigbeeApp/Shared/Common/CommonPage.cs | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs old mode 100755 new mode 100644 index d72d0b2..6aab059 --- a/ZigbeeApp/Shared/Common/CommonPage.cs +++ b/ZigbeeApp/Shared/Common/CommonPage.cs @@ -34,7 +34,10 @@ AddChidren(Phone.UserView.HomePage.Instance); Application.MainPage.AddChidren(Loading); - Phone.UserView.HomePage.Instance.InitPage(); + Phone.UserView.HomePage.Instance.InitPage(); + + //璁剧疆椤堕儴鐘舵�佹爮鏂囧瓧涓洪粦鑹� + Application.SetStatusBarTextBlack(true); } //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi"; @@ -42,12 +45,11 @@ /// <summary> /// 鐗堟湰鍙� /// </summary> - public static string CodeIDString = "1.1.0120082701"; + public static string CodeIDString = "1.1.0121070801"; /// <summary> /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee) /// </summary> public static int RegisterSoruceFromZIGBEE = 0; - public static string Source = "ZIGBEE"; /// <summary> /// Company 鐢ㄦ埛鍏徃鐢ㄤ簬鍏徃App瀹氬埗鐗� 榛樿0 /// </summary> @@ -106,9 +108,9 @@ /// </summary> /// <param name="requestUrl">璇锋眰Url</param> /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param> - /// <param name="timeout">瓒呮椂,榛樿10绉�</param> + /// <param name="timeout">瓒呮椂,榛樿5绉�</param> /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns> - public ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData, int timeout = 10) + public ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData, int timeout = 5) { string result = this.RequestHttpsZigbeeResultAsync(requestUrl, byteData, timeout); if (result != null) @@ -132,9 +134,9 @@ /// </summary> /// <param name="requestUrl">璇锋眰Url</param> /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param> - /// <param name="timeout">瓒呮椂,榛樿10绉�</param> + /// <param name="timeout">瓒呮椂,榛樿5绉�</param> /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns> - public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData, int timeout = 10) + public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData, int timeout = 5) { var result = RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData, "POST", timeout); if (result != null) @@ -151,9 +153,9 @@ /// <param name="requestUrl">璇锋眰Url</param> /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param> /// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param> - /// <param name="timeout">瓒呮椂,榛樿10绉�</param> + /// <param name="timeout">瓒呮椂,榛樿5绉�</param> /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns> - public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 10) + public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 5) { //璇锋眰Url鐨勫畬鎴愯矾寰� var fullUrl = $"{RequestHttpsHost}/{requestUrl}"; @@ -167,9 +169,9 @@ /// <param name="requestUrl">璇锋眰Url</param> /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param> /// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param> - /// <param name="timeout">瓒呮椂,榛樿10绉�</param> + /// <param name="timeout">瓒呮椂,榛樿5绉�</param> /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns> - public byte[] RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 10) + public byte[] RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 5) { //璇锋眰Url鐨勫畬鎴愯矾寰� var fullUrl = $"{Config.Instance.AdminRequestBaseUrl}/{requestUrl}"; @@ -184,9 +186,9 @@ /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param> /// <param name="token">token</param> /// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param> - /// <param name="timeout">瓒呮椂,榛樿10绉�</param> + /// <param name="timeout">瓒呮椂,榛樿5绉�</param> /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns> - public byte[] DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST", int timeout = 10) + public byte[] DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST", int timeout = 5) { try { @@ -199,6 +201,7 @@ webRequest.Timeout = timeout * 1000; //鍙栨秷浣跨敤浠g悊璁块棶 webRequest.Proxy = null; + webRequest.UseDefaultCredentials = false; if (token != null) { //瀵瑰簲寰俊缃戝潃 -- Gitblit v1.8.0