From 691dbe24f5724f153e07947c7b75bdfea5f0b6d5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 24 九月 2024 16:15:15 +0800
Subject: [PATCH] 离线控制模式
---
HDL_ON/DAL/Server/HttpUtil.cs | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 5235064..5d84f01 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,14 +18,17 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- const string APP_KEY = "HDL-HOME-APP-TEST";
- const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string APP_KEY = "HDL-HOME-APP";
+ //public const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
- //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//寮�鍙戠幆澧�
- //const string APP_KEY = "CPEVRLRT";//寮�鍙戠幆澧傾PP_KEY
- //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";//寮�鍙戠幆澧僑ECRET_KEY
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ public const string APP_KEY = "HDL-HOME-APP-TEST";
+ public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+
+ //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
+ //const string APP_KEY = "CPEVRLRT";
+ //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
/// <summary>
/// RegionMark
/// </summary>
@@ -33,7 +36,7 @@
/// <summary>
/// 璇锋眰瓒呮椂鏃堕棿
/// </summary>
- public const int TIME_OUT = 15;
+ public const int TIME_OUT = 10;
/// <summary>
/// 鐗规畩鎺ュ彛璇锋眰瓒呮椂鏃堕棿
/// </summary>
@@ -157,6 +160,11 @@
{
return new ResponsePackNew() { Code = "0" ,Data = "" };
}
+ if (!Common.ApiUtlis.Ins.hadInternet)
+ {
+ MainPage.Log("娌℃湁澶栫綉锛岀洿鎺ラ��鍑鸿姹�");
+ return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR, message = Language.StringByID(StringId.FailedRequestServer) };
+ }
#region HttpWebRequest
try
{
@@ -209,7 +217,12 @@
}
}
IRestResponse response = client.Execute(request);
- HDL_ON.Utlis.WriteLine("鍙戦��", requestFullUrl, response.Request.Body?.Value.ToString());
+ MainPage.Log("鍙戦��:"+ requestFullUrl, response.Request.Body?.Value.ToString());
+ if(apiPath == NewAPI.API_POST_Login)
+ {
+ var ddd = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+ //Console.WriteLine(ddd);
+ }
if (response.StatusCode == HttpStatusCode.OK)
{
try
@@ -238,7 +251,7 @@
}
else
{
- HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.Content);
+ MainPage.Log("Error", $"鎺ュ彛寮傚父:{requestFullUrl} \r\n" + response.Content);
if(response.Content!= null)
{
try
@@ -251,14 +264,14 @@
}
catch { }
}
- return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
+ return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR, message = Language.StringByID(StringId.FailedRequestServer) };
}
}
catch (Exception ex)
{
- HDL_ON.Utlis.WriteLine(ex.Message);
- return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
+ MainPage.Log("Error", $"鎺ュ彛寮傚父x锛歿ex.StackTrace}");
+ return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR ,message = Language.StringByID(StringId.FailedRequestServer) };
}
#endregion
@@ -302,7 +315,7 @@
/// 鍒锋柊 Token
/// </summary>
/// <returns></returns>
- static bool RefreshToken()
+ static bool RefreshToken(bool canRefresh = true)
{
try
{
@@ -317,18 +330,18 @@
UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
UserInfo.Current.AccessToken = revertData.accessToken;
UserInfo.Current.RefreshToken = revertData.refreshToken;
- UserInfo.Current.LastTime = DateTime.Now;
+ UserInfo.Current.ValidToken = true;
UserInfo.Current.SaveUserInfo();
- return true;
#if __IOS__
var sdm = new SiriKit.SceneDateManager();
sdm.AccessToken = UserInfo.Current.LoginTokenString;
sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
+ return true;
}
- else if (revertObj.Code == StateCode.PasswrodError)
+ else //if (revertObj.Code == StateCode.PasswrodError)
{
- UserInfo.Current.LastTime = DateTime.MinValue;
+ UserInfo.Current.ValidToken = false;
}
return false;
}
@@ -493,14 +506,14 @@
else
{
HDL_ON.Utlis.WriteLine(response.Content);
- return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
+ return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR, message = Language.StringByID(StringId.FailedRequestServer) };
}
}
catch (Exception ex)
{
HDL_ON.Utlis.WriteLine(ex.Message);
- return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
+ return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR, message = Language.StringByID(StringId.FailedRequestServer) };
}
#endregion
@@ -538,7 +551,7 @@
}
- #endregion
+#endregion
#region **********绛惧悕鏍￠獙**********
--
Gitblit v1.8.0