From f30c3a80fc170109e15e75f1477263d38026436e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 五月 2024 15:33:25 +0800
Subject: [PATCH] 机械臂本地控制,安防中心成员限制

---
 HDL_ON/DAL/Server/HttpUtil.cs |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index ae59520..cd66d30 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -38,7 +38,7 @@
         /// <summary>
         /// 璇锋眰瓒呮椂鏃堕棿
         /// </summary>
-        public const int TIME_OUT = 15;
+        public const int TIME_OUT = 10;
         /// <summary>
         /// 鐗规畩鎺ュ彛璇锋眰瓒呮椂鏃堕棿
         /// </summary>
@@ -162,6 +162,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
             {
@@ -214,7 +219,7 @@
                     }
                 }
                 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);
@@ -261,14 +266,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 };
+                return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR ,message = Language.StringByID(StringId.FailedRequestServer) };
             }
 
             #endregion
@@ -503,14 +508,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

--
Gitblit v1.8.0