20201127 合并嘉乐代码

wei

2020-11-27 79fe8dab1bcb8e8d92d9058ca2540cd4e8f9ecf9

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -1,8 +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.Mqtt;
using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
@@ -118,9 +119,13 @@
            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.lastTime = DateTime.Now;
                UserInfo.Current.SaveUserInfo();

                 UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
                 UserInfo.Current.LastTime = DateTime.Now;
                 UserInfo.Current.SaveUserInfo();


                UserInfo.Current.refreshToken = revertData.refreshToken;
                return true;
            }
            return false;
@@ -130,13 +135,7 @@


        #region 注册、登录部分
        /// <summary>
        /// 获取请求提交的语言参数
        /// </summary>
        public string GetPostLanguageType()
        {
            return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
        }
       

        /// <summary>
        /// 通用 发送验证码方法
@@ -151,7 +150,7 @@
            var requestObj = new VerifyCodeSendObj()
            {
                verifyType = (int)verifyType,
                languageType = GetPostLanguageType()
                languageType = Utlis.GetPostLanguageType()
            };
            // 是否是手机 
            if (isPhone)
@@ -292,7 +291,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)
                {
@@ -514,7 +516,7 @@

            return resultObj.Code;

            //string jsonString = "{" +

            //string jsonString = "{" +
            //                    "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
            //                    "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
            //                    "\"HomeType\":" + "\"" + "1" + "\"" + "," +
@@ -861,6 +863,28 @@
            return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
        }

        /// <summary>
        ///  下载子账号用户头像
        /// </summary>
        /// <param name="subaccoun"></param>
        /// <returns></returns>
        public byte[] DownChildHeadImage(ResidenceMemberInfo subaccount)
        {
            var requestObj = new ChildBaseObj()
            {
                childAccountId = subaccount.childAccountId,
                homeId = subaccount.homeId
            };
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            var replaceToken = "";
            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                replaceToken = DB_ResidenceData.residenceData.MasterToken;
            }
            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Child_DownloadHeadImage, requestJson,null);
        }
        

        #endregion
        /// <summary>
        /// 获取MQTT远程连接信息接口
@@ -1112,6 +1136,43 @@
                return false;
            }
        }
        #endregion

        #region 检测更新
        /// <summary>
        /// 
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew CheckAppVersion()
        {
            var requestObj = new ForceUpdateObj()
            {
                LanguageType = Utlis.GetPostLanguageType()
            };
#if __IOS__
            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetAppVersion()
        {
            var requestObj = new ForceUpdateObj()
            {

            };
#if __IOS__
            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
        }

        #endregion

        #region 获取天气部分
@@ -1701,6 +1762,38 @@

        #endregion

        #region mqtt
        /// <summary>
        /// 获取MQTT远程连接信息接口
        /// </summary>
        public MqttInfo GetMqttRemoteInfo(string attachClientId)
        {
            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
                {
                    attachClientId = attachClientId,
                    homeType = HomeTypeEnum.BUSPRO.ToString()
                });
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
                }
                else
                {
                    Utlis.WriteLine("GetMqttRemoteInfo error");
                    return null;
                }
            }
            catch
            {
                return null;
            }
        }

        #endregion


    }
}
}