wei
2020-11-27 70f708ee367f1ac5fa4399de035b91bebdd7078f
HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1,9 +1,9 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net;
using System.Text;
using HDL_ON.DAL.Net;
using HDL_ON.DAL.Mqtt;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -112,15 +112,15 @@
        {
            var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
            {
                refreshToken = UserInfo.Current.refreshToken,
                refreshToken = UserInfo.Current.RefreshToken,
            });
            var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
            if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
                UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
                UserInfo.Current.refreshToken = revertData.refreshToken;
                UserInfo.Current.lastTime = DateTime.Now;
                UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
                UserInfo.Current.RefreshToken = revertData.refreshToken;
                UserInfo.Current.LastTime = DateTime.Now;
                UserInfo.Current.SaveUserInfo();
                return true;
            }
@@ -131,13 +131,7 @@
        #region 注册、登录部分
        /// <summary>
        /// 获取请求提交的语言参数
        /// </summary>
        public string GetPostLanguageType()
        {
            return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
        }
        /// <summary>
        /// 通用 发送验证码方法
@@ -152,7 +146,7 @@
            var requestObj = new VerifyCodeSendObj()
            {
                verifyType = (int)verifyType,
                languageType = GetPostLanguageType()
                languageType = Utlis.GetPostLanguageType()
            };
            // 是否是手机 
            if (isPhone)
@@ -293,7 +287,10 @@
                UserInfo.Current.userEmailInfo = info.memberEmail;
                UserInfo.Current.userMobileInfo = info.memberPhone;
                UserInfo.Current.userName = info.memberName;
                UserInfo.Current.areaCode = info.memberPhonePrefix;
                if (!string.IsNullOrEmpty(info.memberPhonePrefix))
                {
                    UserInfo.Current.areaCode = info.memberPhonePrefix;
                }
                //是否需要获取头像
                if (bGetHeadImage)
                {
@@ -515,7 +512,7 @@
            return resultObj.Code;
            //string jsonString = "{" +
            //string jsonString = "{" +
            //                    "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
            //                    "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
            //                    "\"HomeType\":" + "\"" + "1" + "\"" + "," +
@@ -1146,10 +1143,10 @@
        {
            var requestObj = new ForceUpdateObj()
            {
                LanguageType = Utlis.GetPostLanguageType()
            };
#if Android
            requestObj.DeviceType = 1;
#if __IOS__
            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
@@ -1165,8 +1162,8 @@
            {
            };
#if Android
            requestObj.DeviceType = 1;
#if __IOS__
            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);