From 4fef29b9ab9f2632f15a0d45005f92d91de5d4e5 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期四, 27 七月 2023 14:26:59 +0800
Subject: [PATCH] feature 萤石sdk更新

---
 HDL_ON/DAL/Server/HttpUtil.cs |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index aa884c3..2ef648a 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
         /// 鍥哄畾鍩熷悕,姝e紡鐜
         /// 鍏叡鍩熷悕灏辫繎瑙f瀽
         /// </summary>
-        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
-        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+        //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 = "http://59.41.255.150:7777";//mmmm
@@ -45,7 +45,6 @@
         #endregion
 
         #region **********缃戠粶璇锋眰灏佽**********
-
         /// <summary>
         ///  Get  璇锋眰鏈嶅姟鍣ㄦ柟娉�
         /// </summary>
@@ -155,7 +154,7 @@
 
             if(MainPage.NoLoginMode)
             {
-                return new ResponsePackNew() { Code = "0" };
+                return new ResponsePackNew() { Code = "0" ,Data = "" };
             }
             #region HttpWebRequest
             try
@@ -238,7 +237,19 @@
                 }
                 else
                 {
-                    HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.ErrorMessage);
+                    HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.Content);
+                    if(response.Content!= null)
+                    {
+                        try
+                        {
+                            var pack = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
+                            if (pack != null)
+                            {
+                                return pack;
+                            }
+                        }
+                        catch { }
+                    }
                     return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                 }
 

--
Gitblit v1.8.0