From d12e7730bb88d57763a6caaeacb0248a65bf3309 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 03 十二月 2019 13:10:32 +0800
Subject: [PATCH] 2019.12.3
---
ZigbeeApp/Shared/Common/CommonPage.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 5ba11b2..90080f2 100644
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -45,7 +45,7 @@
Phone.UserView.HomePage.Instance.InitPage();
var roomList = new Shared.Phone.Device.Room.RoomManagement();
-
+
Instance.AddLeftView(roomList);
roomList.Show();
}
@@ -62,7 +62,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.19111201";
+ public static string CodeIDString = "1.0.19112901";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -273,8 +273,8 @@
/// <param name="token">token</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- private async System.Threading.Tasks.Task<byte[]> DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST")
- {
+ public async System.Threading.Tasks.Task<byte[]> DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST")
+ {
try
{
//鍒濆鍖栨柊鐨剋ebRequst
@@ -284,7 +284,11 @@
//2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄
webRequest.Method = requestMethod;
webRequest.Timeout = 10 * 1000;
- webRequest.Headers.Add(HttpRequestHeader.Authorization, token);
+ if (token != null)
+ {
+ //瀵瑰簲寰俊缃戝潃
+ webRequest.Headers.Add(HttpRequestHeader.Authorization, token);
+ }
if (requestMethod == "GET")
{
//webRequest.ContentType = "text/html";
@@ -322,8 +326,10 @@
}
}
catch (Exception e)
- {
- System.Console.WriteLine(e.Message);
+ {
+#if DEBUG
+ System.Console.WriteLine(e.Message);
+#endif
return null;
}
}
@@ -603,4 +609,4 @@
}
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0