更新极光Sdk531

wxr

2024-11-01 c0c734d7a84cf7105401878ffc4b64cbb67621d1

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -19,13 +19,16 @@
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";
        //const string APP_KEY = "COSDFPIN";
        //const string SECRET_KEY = "COSDFPJDCOSDFPJT";
        const string APP_KEY = "QWERREWQ";
        const string SECRET_KEY = "CPBUCTRLCPBUABCD";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        public const string APP_KEY = "QWERREWQ";
        public const string SECRET_KEY = "CPBUCTRLCPBUABCD";

        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm

        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        //public const string APP_KEY = "HDL-HOME-APP-TEST";
        //public const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";


        /// <summary>
        /// RegionMark
        /// </summary>
@@ -46,7 +49,6 @@
        #endregion

        #region **********网络请求封装**********

        /// <summary>
        ///  Get  请求服务器方法
        /// </summary>
@@ -156,7 +158,7 @@

            if(MainPage.NoLoginMode)
            {
                return new ResponsePackNew() { Code = "0" };
                return new ResponsePackNew() { Code = "0" ,Data = "" };
            }
            #region HttpWebRequest
            try
@@ -174,7 +176,7 @@
                RestRequest request = new RestRequest(method);
                request.Timeout = mTimeout * 1000;
                request.AddHeader("content-type", "application/json");
                request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "zh" : "en");//增加语言标识
                request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "cn" : "en");//增加语言标识 wxr 2023-03-22 17:03:34

                if (string.IsNullOrEmpty(replaceToken))
                {
@@ -187,6 +189,7 @@
                {
                    request.AddHeader("Authorization", replaceToken); 
                }

           
                if (bodyParameterJson != null)
                {
@@ -208,8 +211,13 @@
                        request.AddUrlSegment(data.Key, data.Value.ToString());
                    }
                }

                IRestResponse response = client.Execute(request);
                HDL_ON.Utlis.WriteLine("发送", 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
@@ -227,7 +235,7 @@
                            revertObj.Data = "";
                        }
                        //*****一些判空处理*****************

                        HDL_ON.Utlis.WriteLine("接收", requestFullUrl, response.Content);
                        return revertObj;
                    }
                    catch (Exception ex)
@@ -238,7 +246,19 @@
                }
                else
                {
                    HDL_ON.Utlis.WriteLine(response.Content);
                    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 };
                }

@@ -290,7 +310,7 @@
        /// 刷新  Token
        /// </summary>
        /// <returns></returns>
        static bool RefreshToken()
        static bool RefreshToken(bool canRefresh = true)
        {
            try
            {
@@ -307,12 +327,12 @@
                    UserInfo.Current.RefreshToken = revertData.refreshToken;
                    UserInfo.Current.LastTime = DateTime.Now;
                    UserInfo.Current.SaveUserInfo();
                    return true;
#if __IOS__
                    //var sdm = new SiriKit.SceneDateManager();
                    //sdm.AccessToken = UserInfo.Current.LoginTokenString;
                    //sdm.RefreshToken = UserInfo.Current.RefreshToken;
                    var sdm = new SiriKit.SceneDateManager();
                    sdm.AccessToken = UserInfo.Current.LoginTokenString;
                    sdm.RefreshToken = UserInfo.Current.RefreshToken;
#endif
                    return true;
                }
                else if (revertObj.Code == StateCode.PasswrodError)
                {
@@ -351,7 +371,6 @@
                RestRequest request = new RestRequest(Method.POST);
                request.Timeout = mTimeout * 1000;
                request.AddHeader("content-type", "application/json");
                request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "cn" : "en");//增加语言标识

                if (string.IsNullOrEmpty(replaceToken))
                {
@@ -527,10 +546,10 @@

        }

        #endregion
#endregion

        #region **********签名校验**********
        

        /// <summary>
        /// 获取当前时间戳值
        /// </summary>