From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Common/CommonPage.cs | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 9a8e327..7f452cf 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,12 +42,11 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0120070302";
+ public static string CodeIDString = "1.1.0120091701";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
public static int RegisterSoruceFromZIGBEE = 0;
- public static string Source = "ZIGBEE";
/// <summary>
/// Company 鐢ㄦ埛鍏徃鐢ㄤ簬鍏徃App瀹氬埗鐗� 榛樿0
/// </summary>
@@ -95,10 +94,6 @@
/// 鐢ㄤ簬楠岃瘉閭姝ｅ垯琛ㄨ揪寮�
/// </summary>
public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
- /// <summary>
- /// 褰撳墠缃戠粶杩炴帴鐨勬ā寮� 0:娌℃湁缃戠粶 1锛氳繙绋嬭繛鎺ワ紝涔熷彨3G,4G 2锛歐IFI
- /// </summary>
- public static int nowNetworkMode = 0;
/// <summary>
/// 瀹夊崜鐨勭郴缁熻繑鍥炴寜閿兘鍚︽寜涓�(姣斿鍦ㄥ浠借繕鍘熸椂,涓嶈兘鎸変笅杩斿洖閿�)
/// </summary>
@@ -110,9 +105,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)
@@ -136,9 +131,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)
@@ -155,9 +150,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}";
@@ -171,9 +166,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}";
@@ -188,9 +183,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
{
@@ -203,6 +198,7 @@
webRequest.Timeout = timeout * 1000;
//鍙栨秷浣跨敤浠ｇ悊璁块棶
webRequest.Proxy = null;
+ webRequest.UseDefaultCredentials = false;
if (token != null)
{
//瀵瑰簲寰俊缃戝潃
@@ -359,6 +355,10 @@
/// <returns>杩斿洖鐘舵�佺爜</returns>
public string PushRegID()
{
+#if DEBUG
+ //璋冭瘯涓嶉渶瑕佸彂閫佽繖涓笢瑗�
+ return null;
+#endif
try
{
string deviceAlias;
@@ -368,8 +368,9 @@
deviceType = "iphone";
#elif Android
deviceAlias = Android.OS.Build.Manufacturer;
- deviceType = "android";
-#endif
+ deviceType = "android";
+#endif
+
var RegIDObj = new SendDataToServer.SignZigbeeNeedPushRegIDObj()
{
RegID = Shared.Common.Config.Instance.RegistrationID,
@@ -377,11 +378,16 @@
DeviceType = deviceType
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
- var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson), 4);
if (reverObj == null)
- {
+ {
+ //璋冭瘯:璁板綍鏋佸厜ID
+ Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "send:" + RegIDObj.RegID + " fail,receive obj is null", false, true);
return null;
- }
+ }
+ //璋冭瘯:璁板綍鏋佸厜ID
+ Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "send:" + RegIDObj.RegID + " result:" + reverObj.StateCode, false, true);
+
return reverObj.StateCode;
}
catch
--
Gitblit v1.8.0