From 437c7a6d88d11e500fc19a3dd198aec28412f06b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 十一月 2020 17:48:23 +0800
Subject: [PATCH] 2020-11-20 1.修改UserInfo调用方法。2.增加保存用户注册域名信息。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index b31745f..86ad582 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -111,15 +111,15 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
{
- refreshToken = MainPage.LoginUser.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());
- MainPage.LoginUser.loginTokenString = revertData.headerPrefix + revertData.accessToken;
- MainPage.LoginUser.lastTime = DateTime.Now;
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.SaveUserInfo();
return true;
}
return false;
@@ -319,26 +319,26 @@
if (resultObj.Code == StateCode.SUCCESS)
{
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
- MainPage.LoginUser.userEmailInfo = info.memberEmail;
- MainPage.LoginUser.userMobileInfo = info.memberPhone;
- MainPage.LoginUser.userName = info.memberName;
- MainPage.LoginUser.areaCode = info.memberPhonePrefix;
+ UserInfo.Current.userEmailInfo = info.memberEmail;
+ UserInfo.Current.userMobileInfo = info.memberPhone;
+ UserInfo.Current.userName = info.memberName;
+ UserInfo.Current.areaCode = info.memberPhonePrefix;
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
var headImageBytes = DownHeadImage();
if (headImageBytes != null)
{
- MainPage.LoginUser.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
FileStream fs = null;
try
{
- MainPage.LoginUser.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
fs.Write(headImageBytes, 0, headImageBytes.Length);
fs.Flush();
- MainPage.LoginUser.headImagePagePath = filePath;
+ UserInfo.Current.headImagePagePath = filePath;
}
catch (Exception ex)
{
@@ -355,7 +355,7 @@
}
}
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
@@ -368,8 +368,8 @@
//{
// var dataStr = JObject.FromObject(revertObj.ResponseData);
// //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109", < !--甯愬彿Id-- >
- // MainPage.LoginUser.userEmailInfo = dataStr.GetValue("Email").ToString();
- // MainPage.LoginUser.userMobileInfo = dataStr.GetValue("Phone").ToString();
+ // UserInfo.Current.userEmailInfo = dataStr.GetValue("Email").ToString();
+ // UserInfo.Current.userMobileInfo = dataStr.GetValue("Phone").ToString();
// FileStream fs = null;
// try
// {
@@ -378,12 +378,12 @@
// {
// var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
// var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- // MainPage.LoginUser.headImagePageBytes = headImageBytes;
+ // UserInfo.Current.headImagePageBytes = headImageBytes;
// var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
// fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
// fs.Write(headImageBytes, 0, headImageBytes.Length);
// fs.Flush();
- // MainPage.LoginUser.headImagePagePath = filePath;
+ // UserInfo.Current.headImagePagePath = filePath;
// }
// }
// catch (Exception ex)
@@ -399,13 +399,13 @@
// }
// // "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
// // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
- // MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
+ // UserInfo.Current.userName = dataStr.GetValue("UserName").ToString();
// Application.RunOnMainThread(() =>
// {
// });
- // MainPage.LoginUser.SaveUserInfo();
+ // UserInfo.Current.SaveUserInfo();
// MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
//}
@@ -502,7 +502,7 @@
}
else
{
- MainPage.LoginUser.regionList = new List<RegionInfoRes>();
+ UserInfo.Current.regionList = new List<RegionInfoRes>();
foreach (var mHome in homeList)
{
@@ -527,14 +527,14 @@
{
continue;
}
- MainPage.LoginUser.regionList.Add(home);
+ UserInfo.Current.regionList.Add(home);
if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
{
- DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
}
}
DB_ResidenceData.residenceData.SaveResidenceData();
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
}
}
@@ -545,7 +545,7 @@
// "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
// "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
// "\"HomeType\":" + "\"" + "1" + "\"" + "," +
- // "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
+ // "\"LoginAccessToken\":" + "\"" + UserInfo.Current.loginTokenString + "\"" +
// "}";
//var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
@@ -584,7 +584,7 @@
// // }
// // ]
// //}}
- // MainPage.LoginUser.regionList = new List<RegionInfoRes>();
+ // UserInfo.Current.regionList = new List<RegionInfoRes>();
// foreach (var jsonData in dataStr.GetValue("PageData"))
// {
// var homeJsonStr = JObject.FromObject(jsonData);
@@ -601,14 +601,14 @@
// {
// continue;
// }
- // MainPage.LoginUser.regionList.Add(home);
+ // UserInfo.Current.regionList.Add(home);
// if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
// {
- // DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ // DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
// }
// }
// DB_ResidenceData.residenceData.SaveResidenceData();
- // MainPage.LoginUser.SaveUserInfo();
+ // UserInfo.Current.SaveUserInfo();
// }
//}
//return responsePack.StateCode;
@@ -624,7 +624,7 @@
//娣诲姞鍏冪礌
d.Add("RequestVersion", MainPage.VersionString);
d.Add("RequestSource", "2");
- d.Add("LoginAccessToken", MainPage.LoginUser.loginTokenString);
+ d.Add("LoginAccessToken", UserInfo.Current.loginTokenString);
d.Add("HomeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
d.Add("HomeType", 1);
d.Add("Name", DB_ResidenceData.residenceData.residecenInfo.Name);
@@ -643,7 +643,7 @@
public ResponsePackNew GetResidenceMemberAccount()
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
- var replaceToken = MainPage.LoginUser.loginTokenString;
+ var replaceToken = UserInfo.Current.loginTokenString;
//濡傛灉褰撳墠鎵�鍒嗕韩浣忓畢鍜屼负绠＄悊鍛橈紝鏇挎崲涓轰富浜簍oken
//寰呭鐞�...
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_FindAll, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
@@ -661,7 +661,7 @@
homeId = subaccount.homeId
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var replaceToken = MainPage.LoginUser.loginTokenString;
+ var replaceToken = UserInfo.Current.loginTokenString;
//濡傛灉褰撳墠鎵�鍒嗕韩浣忓畢鍜屼负绠＄悊鍛橈紝鏇挎崲涓轰富浜簍oken
//寰呭鐞�...
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_Delete, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
--
Gitblit v1.8.0