From d6f398b6b07315d327be2994081eb31ae100ba03 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 16 十一月 2020 19:09:00 +0800
Subject: [PATCH] 2020-11-16 1.更新备份
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 27 --
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs | 34 --
HDL_ON/DAL/Server/IMessageCommon.cs | 9
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 35 ---
HDL-ON_iOS/Resources/Language.ini | 2
HDL_ON/DAL/Server/NewAPI.cs | 43 +++
HDL_ON/DAL/Server/NewApiRes.cs | 108 ++++++++++
HDL_ON/Common/R.cs | 5
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs | 34 --
HDL_ON/DAL/Server/HttpServerRequest.cs | 209 ++++++++++++--------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 29 ++
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs | 35 ---
14 files changed, 337 insertions(+), 240 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 77822e4..e6d5c5a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,27 +1,44 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPageBLL.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs">
<Files>
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="436" Column="1" IsPinned="True" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="1042" Column="1" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="17" Column="25" IsPinned="True" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs" Line="69" Column="123" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs" Line="199" Column="88" />
+ <File FileName="HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs" Line="7" Column="25" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="Server" expanded="True" />
</Node>
+ <Node name="Entity" expanded="True">
+ <Node name="ResponseEntity" expanded="True">
+ <Node name="ResidenceMemberInfo.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True">
- <Node name="LoginPageBLL.cs" selected="True" />
+ <Node name="UI1-Login" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="AccountBindInfo" expanded="True" />
+ <Node name="MemberManagement" expanded="True" />
+ <Node name="ResetAccountPassword" expanded="True" />
+ <Node name="RoomListManage" expanded="True" />
+ <Node name="UnlockSetting" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
<Node name="References" expanded="True" />
+ <Node name="Resources" expanded="True">
+ <Node name="js" expanded="True" />
+ </Node>
</Node>
</Node>
</State>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 42742fe..43b68d6 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -14,6 +14,7 @@
42=Network anomaly
10001=Failed to request the server, please try again later!
+10002=System maintenance, please try again later!
[Chinese]
1=鐧诲綍
@@ -429,4 +430,5 @@
5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
+10002=绯荤粺缁存姢涓�,璇风◢鍚庡啀璇�!
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 04f2d07..3fb82f0 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -432,6 +432,11 @@
/// 璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
/// </summary>
public const int FailedRequestServer = 10001;
+ /// <summary>
+ /// 绯荤粺缁存姢涓� ~璇风◢鍚庡啀璇晘
+ /// </summary>
+ public const int SystemMaintenance = 10002;
+
#endregion
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index b8f4f5c..f6110e1 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -250,32 +250,15 @@
-
-
-
- /// <summary>
- /// 鑾峰彇鐧诲綍楠岃瘉鐮�
- /// </summary>
- public ResponsePack GetLoginVerCode(string account)
- {
-
- string jsonString = "{" +
- "\"Account\":" + "\"" + account + "\"" + "," +
- "\"AreaCode\":" + "86" +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
- }
-
///// <summary>
- ///// 鍙戦�侀獙璇佺爜
+ ///// 鑾峰彇鐧诲綍楠岃瘉鐮�
///// </summary>
- //public ResponsePack SendSms(string account)
+ //public ResponsePack GetLoginVerCode(string account)
//{
+
// string jsonString = "{" +
// "\"Account\":" + "\"" + account + "\"" + "," +
- // "\"Company\":" + MainPage.Company + "," +
- // "\"Language\":" + "\"" + Language.CurrentLanguage + "\"" + "," +
- // "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
+ // "\"AreaCode\":" + "86" +
// "}";
// return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
//}
@@ -286,15 +269,21 @@
/// <param name="account"></param>
/// <param name="code"></param>
/// <returns></returns>
- public ResponsePack ValidatorCode(string account, string code, int countryIndex)
+ public ResponsePackNew ValidatorCode(VerifyType verifyType, string account, string code, bool isPhone)
{
- string jsonString = "{" +
- "\"Account\":" + "\"" + account + "\"" + "," +
- "\"Code\":" + "\"" + code + "\"" + "," +
- "\"Language\":" + "\"" + Language.CurrentLanguage + "\"" + "," +
- "\"AreaCode\":" + countryIndex +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/ValidatorCode", jsonString, false);
+ var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType };
+ if (isPhone)
+ {
+ //鎵嬫満
+ requestObj.phone = account;
+ }
+ else
+ {
+ //閭
+ requestObj.mail = account;
+ }
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Check, requestJson);
}
@@ -322,24 +311,22 @@
/// <returns></returns>
public void GetUserInfo()
{
- Dictionary<string, object> d = new Dictionary<string, object>();
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
-
- if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
+ var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
+ var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
+ if (resultObj.Code == StateCode.SUCCESS)
{
- 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();
- FileStream fs = null;
- try
+ 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;
+
+ var headImageBytes = DownHeadImage();
+ if (headImageBytes != null)
{
- var headImageString = dataStr.GetValue("HeadImage").ToString();
- if (!string.IsNullOrEmpty(headImageString))
+ MainPage.LoginUser.headImagePageBytes = headImageBytes;
+ FileStream fs = null;
+ try
{
- var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
- var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
MainPage.LoginUser.headImagePageBytes = headImageBytes;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
@@ -347,30 +334,82 @@
fs.Flush();
MainPage.LoginUser.headImagePagePath = filePath;
}
- }
- catch (Exception ex)
- {
- MainPage.Log($"download headImage error : {ex.Message}");
- }
- finally
- {
- if (fs != null)
+ catch (Exception ex)
{
- fs.Close();
+ MainPage.Log($"download headImage error : {ex.Message}");
}
- }
- // "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
- // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
- MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
+ finally
+ {
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ }
- Application.RunOnMainThread(() =>
- {
- });
+ }
MainPage.LoginUser.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
+
+ // Dictionary<string, object> d = new Dictionary<string, object>();
+ //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ //var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
+
+ //if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
+ //{
+ // 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();
+ // FileStream fs = null;
+ // try
+ // {
+ // var headImageString = dataStr.GetValue("HeadImage").ToString();
+ // if (!string.IsNullOrEmpty(headImageString))
+ // {
+ // var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
+ // var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
+ // MainPage.LoginUser.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;
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // MainPage.Log($"download headImage error : {ex.Message}");
+ // }
+ // finally
+ // {
+ // if (fs != null)
+ // {
+ // fs.Close();
+ // }
+ // }
+ // // "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
+ // // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
+ // MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
+
+ // Application.RunOnMainThread(() =>
+ // {
+ // });
+
+ // MainPage.LoginUser.SaveUserInfo();
+ // MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
+ //}
+
+ }
+
+ /// <summary>
+ /// 涓嬭浇鐢ㄦ埛澶村儚
+ /// </summary>
+ public byte[] DownHeadImage()
+ {
+ return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Head_Down, null);
}
/// <summary>
@@ -378,14 +417,12 @@
/// </summary>
/// <param name="userName"></param>
/// <returns></returns>
- public ResponsePack EditUserName(string userName)
+ public ResponsePackNew EditUserName(string userName)
{
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("UserName", userName);
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateUserName", requestJson, true);
- return revertObj;
-
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes() {
+ memberName = userName
+ });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
/// <summary>
@@ -398,25 +435,33 @@
FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
byte[] bytes = new byte[fs.Length];
fs.Read(bytes, 0, bytes.Length);
-
- Dictionary<string, byte[]> d = new Dictionary<string, byte[]>();
- d.Add("HeadImage", bytes);
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-
- var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateHeadImage", requestJson, true);
- return revertObj.StateCode;
+ var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
+ return revertObj.Code;
}
/// <summary>
/// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
+ /// 2020-11-16 寰呬慨鏀�
/// </summary>
/// <param name="account"></param>
+ /// <param name="code"></param>
+ /// <param name="isPhone"></param>
/// <returns></returns>
- public string BindAccount(string account)
+ public string BindAccount(string account, string code = "", bool isPhone = false)
{
- string jsonString = "{" + "\"Account\":" + "\"" + account + "\"" + "}";
- var responsePack = RequestHttps($"{severAddress}/ZigbeeUsers/BindAccount", jsonString, true);
- return responsePack.StateCode;
+ var requestObj = new BindWithAccountObj() { verifyCode = code};
+ if (isPhone)
+ {
+ //鎵嬫満
+ requestObj.memberPhone = account;
+ }
+ else
+ {
+ //閭
+ requestObj.memberMail = account;
+ }
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson).Code;
}
#endregion
@@ -575,12 +620,10 @@
/// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
/// </summary>
/// <returns></returns>
- public ResponsePack GetResidenceMemberAccount()
+ public ResponsePackNew GetResidenceMemberAccount()
{
- Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("DistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountByDistributedMark", jsonString, true);
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_FindAll, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
}
/// <summary>
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index c1912c7..9239d02 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -60,13 +60,12 @@
stateCodeDic["DATA_EXCEPTION"] = HDL_ON.StringId.DataExceptionPleaseTryAgain;
#region 鍩虹鏈嶅姟 鏂伴敊璇爜
- ////鏈嶅姟鍣ㄦ鍦ㄥ崌绾�
- //stateCodeDic["2"] = HDL_ON.StringId.FailureToServer;
- ////楠岃瘉鐮佹牎楠屽け璐�
- //stateCodeDic["14"] = HDL_ON.StringId.ValidatorCode_ValidCodeAndPhoneNoEqual;
+ //绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
+ stateCodeDic["2"] = HDL_ON.StringId.SystemMaintenance;
+ //楠岃瘉鐮佹牎楠屽け璐�
+ stateCodeDic["14"] = HDL_ON.StringId.VerificationCodeWrong;
////浼氳瘽瓒呮椂锛岃鏇存柊token
//stateCodeDic["10001"] = HDL_ON.StringId.uOperationFailed;
-
////鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇�
stateCodeDic["10008"] = HDL_ON.StringId.LoginFailed_AccountOrPasswordError;
//璐﹀彿涓嶅瓨鍦�
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index aa00650..911ccff 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -25,10 +25,6 @@
/// </summary>
public const string API_POST_Login = "/smart-footstone/member/oauth/login";
/// <summary>
- /// 鍙戦�侀獙璇佺爜
- /// </summary>
- public const string API_POST_Verification_Send = "/smart-footstone/verification/message/send";
- /// <summary>
/// 杈撳叆楠岃瘉鐮佹敞鍐�
/// </summary>
public const string API_POST_Member_Register = "/smart-footstone/member/oauth/register";
@@ -40,6 +36,45 @@
/// 淇敼瀵嗙爜
/// </summary>
public const string API_POST_Update_Pwd = "/smart-footstone/member/memberInfo/updatePwd";
+ /// <summary>
+ /// 鍙戦�侀獙璇佺爜
+ /// </summary>
+ public const string API_POST_Verification_Send = "/smart-footstone/verification/message/send";
+ /// <summary>
+ /// 楠岃瘉娑堟伅楠岃瘉鐮�
+ /// </summary>
+ public const string API_POST_Verification_Check = "/smart-footstone/verification/message/check";
+ #region 鐢ㄦ埛淇℃伅銆佸ご鍍忋�佺粦瀹氳璇�(鎵嬫満/閭)
+ /// <summary>
+ /// 鑾峰彇涓汉淇℃伅
+ /// </summary>
+ public const string API_POST_Member_GetMemberInfo = "/smart-footstone/member/memberInfo/getMemberInfo";
+ /// <summary>
+ /// 鏇存柊涓汉淇℃伅
+ /// </summary>
+ public const string API_POST_Member_UpdateMemberInfo = "/smart-footstone/member/memberInfo/updateMemberInfo";
+ /// <summary>
+ /// 涓婁紶澶村儚
+ /// </summary>
+ public const string API_POST_Head_Upload = "/home-wisdom/head/portrait/upload";
+ /// <summary>
+ /// 涓嬭浇澶村儚
+ /// </summary>
+ public const string API_POST_Head_Down = "/home-wisdom/head/portrait/down";
+ /// <summary>
+ /// 鏍规嵁璐﹀彿涓嬭浇澶村儚
+ /// </summary>
+ public const string API_POST_Head_DownWithAccount = "/home-wisdom/head/portrait/downWithAccount";
+ /// <summary>
+ /// 缁戝畾璁よ瘉(鎵嬫満/閭)
+ /// </summary>
+ public const string API_POST_Member_BindWithAccount = "/smart-footstone/member/memberInfo/bindWithAccount";
+ /// <summary>
+ /// 瑙ｇ粦璁よ瘉(鎵嬫満/閭)
+ /// </summary>
+ public const string API_POST_Member_UnbindWithAccount = "/smart-footstone/member/memberInfo/unbindWithAccount";
+ #endregion
+
#endregion
#region 鈻� HomeCluster -- 浣忓畢绠＄悊鎺ュ彛___________________________
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 47056a3..ff11be3 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -6,12 +6,18 @@
#region **************************************鏂版湇鍔″櫒**************************************
[System.Serializable]
- public class Base3NoTokenObj
+ public class BaseNoTokenObj
{
//public string RequestVersion = MainPage.CodeIDString;
////璇锋眰鏉ユ簮
//public string clientType = MainPage.ClientType;
+ }
+
+ [System.Serializable]
+ public class NullObj
+ {
+
}
#region 鈻� 鍏ㄧ悆鍖哄煙鍒楄〃 ____________________________
@@ -164,7 +170,9 @@
public string memberName;
}
- //鍙戦�侀獙璇佺爜
+ /// <summary>
+ /// 鍙戦�侀獙璇佺爜
+ /// </summary>
[System.Serializable]
public class VerifyCodeSendObj
{
@@ -185,7 +193,7 @@
/// </summary>
public string mail;
/// <summary>
- /// 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱櫥闄� 4:缁戝畾
+ /// 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
/// 榛樿浼�1
/// </summary>
public int verifyType = 1;
@@ -193,6 +201,32 @@
/// 楠岃瘉鐮佽繃鏈熸椂闂达紙绉掞級,榛樿5鍒嗛挓
/// </summary>
public int expireSecond = 300;
+
+ }
+
+ /// <summary>
+ /// 楠岃瘉楠岃瘉鐮�
+ /// </summary>
+ [System.Serializable]
+ public class VerifyCodeCheckObj
+ {
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public string phone;
+ /// <summary>
+ /// 閭
+ /// </summary>
+ public string mail;
+ /// <summary>
+ /// 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
+ /// 榛樿浼�1
+ /// </summary>
+ public int verifyType = 1;
+ /// <summary>
+ /// 楠岃瘉鐮佽繃鏈熸椂闂达紙绉掞級,榛樿5鍒嗛挓
+ /// </summary>
+ public string verifyCode;
}
@@ -244,6 +278,70 @@
public string loginNewPwd;
}
+
+ #endregion
+
+ #region 鈻� 甯愬彿淇℃伅 ____________________________
+ /// <summary>
+ /// 鑾峰彇涓汉淇℃伅
+ /// </summary>
+ [System.Serializable]
+ public class MemberInfoRes
+ {
+ /// <summary>
+ /// 鐢ㄦ埛ID
+ /// </summary>
+ public string memberId;
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string memberName;
+ /// <summary>
+ /// 鐢ㄦ埛閭
+ /// </summary>
+ public string memberEmail;
+ /// <summary>
+ /// 鐢ㄦ埛鎵嬫満鍙�
+ /// </summary>
+ public string memberPhone;
+
+ }
+
+ /// <summary>
+ /// 鏇存柊涓汉淇℃伅
+ /// </summary>
+ [System.Serializable]
+ public class UpdateMemberNameRes
+ {
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string memberName;
+
+ }
+
+
+ /// <summary>
+ /// 缁戝畾璁よ瘉(鎵嬫満/閭)
+ /// </summary>
+ [System.Serializable]
+ public class BindWithAccountObj
+ {
+ /// <summary>
+ /// 鐢ㄦ埛鎵嬫満
+ /// </summary>
+ public string memberPhone;
+ /// <summary>
+ /// 鐢ㄦ埛鎵嬫満
+ /// </summary>
+ public string memberMail;
+ /// <summary>
+ /// 楠岃瘉鍚�
+ /// </summary>
+ public string verifyCode;
+
+
+ }
#endregion
@@ -1044,11 +1142,11 @@
/// </summary>
REGISTER_USER = 1,
/// <summary>
- /// 蹇樿瀵嗙爜
+ /// 蹇樿瀵嗙爜,鎵惧洖瀵嗙爜
/// </summary>
FIND_PASSWORD,
/// <summary>
- /// 楠岃瘉鐮佺櫥闄�
+ /// 缁戝畾
/// </summary>
REGISTER_USER_SYSTEM,
/// <summary>
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index fb21d58..a99a04e 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -4,6 +4,7 @@
namespace HDL_ON.Entity
{
/// <summary>
+ /// 2020-11-16 寰呬慨鏀硅皟鏁�
/// 浣忓畢鎴愬憳鐨勪俊鎭垪琛�
/// </summary>
public class ResidenceMemberInfo
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
index 8588606..2420826 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
@@ -2,6 +2,7 @@
using Shared;
using HDL_ON.UI.CSS;
using System.Threading;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
@@ -147,11 +148,12 @@
{
if (optionType == 1)
{
- var result = new DAL.Server.HttpServerRequest().GetLoginVerCode(MainPage.LoginUser.userEmailInfo);
+ var resultObj = new HttpServerRequest().VerificationCodeSend(VerifyType.REGISTER_USER_SYSTEM, MainPage.LoginUser.userEmailInfo);
+
}
else if (optionType == 2)
{
- var result = new DAL.Server.HttpServerRequest().GetLoginVerCode(MainPage.LoginUser.userMobileInfo);
+ var resultObj = new HttpServerRequest().VerificationCodeSend(VerifyType.REGISTER_USER_SYSTEM, MainPage.LoginUser.userMobileInfo, true, MainPage.LoginUser.areaCode.ToString());
}
})
{ IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs
index 3f3c124..5744a72 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs
@@ -491,35 +491,16 @@
act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
});
var verAccount = optionType == 1 ? MainPage.LoginUser.userEmailInfo : MainPage.LoginUser.userMobileInfo;
- var response = new HttpServerRequest().ValidatorCode(verAccount, etCode, MainPage.LoginUser.areaCode);
- if (response.StateCode.ToUpper() == StateCode.SUCCESS)
+ var isPhone = optionType == 2;
+ var resultObj = new HttpServerRequest().ValidatorCode(VerifyType.REGISTER_USER_SYSTEM, verAccount, etCode, isPhone);
+ if (resultObj.Code == StateCode.SUCCESS)
{
result = true;
}
else
{
- string erorrInfo = "";
- switch (response.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual"://楠岃瘉鐮侀敊璇�
- erorrInfo = Language.StringByID(StringId.VerificationCodeWrong);
- break;
- case "NoRecord":
- erorrInfo = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- default:
- erorrInfo = "Server error";
- break;
- }
- Application.RunOnMainThread(() =>
- {
- new Tip()
- {
- CloseTime = 1,
- Direction = AMPopTipDirection.None,
- Text = erorrInfo,
- }.Show(bodyView);
- });
+ //澶辫触鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Check, resultObj.Code);
}
Application.RunOnMainThread(() =>
{
@@ -642,11 +623,12 @@
{
if (optionType == 1)
{
- var result = new DAL.Server.HttpServerRequest().GetLoginVerCode(MainPage.LoginUser.userEmailInfo);
+ var resultObj = new HttpServerRequest().VerificationCodeSend(VerifyType.REGISTER_USER_SYSTEM, MainPage.LoginUser.userEmailInfo);
+
}
else if (optionType == 2)
{
- var result = new DAL.Server.HttpServerRequest().GetLoginVerCode(MainPage.LoginUser.userMobileInfo);
+ var resultObj = new HttpServerRequest().VerificationCodeSend(VerifyType.REGISTER_USER_SYSTEM, MainPage.LoginUser.userMobileInfo, true, MainPage.LoginUser.areaCode.ToString());
}
})
{ IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
index ada9433..b07efff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
@@ -193,10 +193,10 @@
bool LoadMethod_GetResidenceMemberAccount()
{
var result = false;
- ResponsePack responePack = new HttpServerRequest().GetResidenceMemberAccount();
- if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
+ var responePack = new HttpServerRequest().GetResidenceMemberAccount();
+ if (responePack.Code == StateCode.SUCCESS)
{
- memberList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.ResponseData.ToString());
+ memberList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
foreach (var mInfo in memberList)
{
ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.Account);
@@ -231,37 +231,12 @@
//澶辫触
else
{
- string tipStr = "Sever erorr";
- switch (responePack.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual":
- tipStr = Language.StringByID(StringId.VerificationCodeError);
- break;
- case "USERNAMEORPWDERROR":
- tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- break;
- case "ACCOUNTNOEXISTS":
- tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- break;
- case "NoRecord":
- tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- case "Self:Net_Error":
- tipStr = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
+ //鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Child_FindAll, responePack.Code);
//璐﹀彿鎴栬�呭瘑鐮侀敊璇�
Application.RunOnMainThread(() =>
{
waitPage.Hide();
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
});
}
Application.RunOnMainThread(() =>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index e7e4e26..ea5abde 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -63,10 +63,10 @@
bool LoadMethod_GetResidenceMemberAccount()
{
var result = false;
- ResponsePack responePack = new HttpServerRequest().GetResidenceMemberAccount();
- if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
+ var responePack = new HttpServerRequest().GetResidenceMemberAccount();
+ if (responePack.Code == StateCode.SUCCESS)
{
- var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.ResponseData.ToString());
+ var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
foreach (var mInfo in responeObj)
{
ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.Account);
@@ -110,37 +110,12 @@
//澶辫触
else
{
- string tipStr = "Sever erorr";
- switch (responePack.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual":
- tipStr = Language.StringByID(StringId.VerificationCodeError);
- break;
- case "USERNAMEORPWDERROR":
- tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- break;
- case "ACCOUNTNOEXISTS":
- tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- break;
- case "NoRecord":
- tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- case "Self:Net_Error":
- tipStr = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
+ //鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Child_FindAll, responePack.Code);
//璐﹀彿鎴栬�呭瘑鐮侀敊璇�
Application.RunOnMainThread(() =>
{
waitPage.Hide();
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
});
}
Application.RunOnMainThread(() =>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 68279d1..e2208cb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -180,8 +180,8 @@
{
try
{
- var responsePack = new HttpServerRequest().EditUserName(str);
- if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS)
+ var resultObj = new HttpServerRequest().EditUserName(str);
+ if (resultObj.Code == StateCode.SUCCESS)
{
MainPage.LoginUser.userName = str;
MainPage.LoginUser.SaveUserInfo();
@@ -193,27 +193,8 @@
}
else
{
- var tipStr = "Server erorr";
- switch (responsePack.StateCode)
- {
- case "NoLogin":
- tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
- break;
- case "AccountNoExists":
- tipStr = "";
- break;
- }
- Application.RunOnMainThread(() =>
- {
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- });
+ //澶辫触鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Member_UpdateMemberInfo, resultObj.Code);
}
}
catch (Exception ex)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
index 7415923..812f139 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
@@ -475,35 +475,16 @@
{
act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
});
- var response = new HttpServerRequest().ValidatorCode(MainPage.LoginUser.userEmailInfo, etCode, MainPage.LoginUser.areaCode);
- if (response.StateCode.ToUpper() == StateCode.SUCCESS)
+ bool isPhone = optionType == 2;
+ var resultObj = new HttpServerRequest().ValidatorCode(VerifyType.FIND_PASSWORD, MainPage.LoginUser.userEmailInfo, etCode, isPhone);
+ if (resultObj.Code == StateCode.SUCCESS)
{
result = true;
}
else
{
- string erorrInfo = "";
- switch (response.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual"://楠岃瘉鐮侀敊璇�
- erorrInfo = Language.StringByID(StringId.VerificationCodeWrong);
- break;
- case "NoRecord":
- erorrInfo = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- default:
- erorrInfo = "Server error";
- break;
- }
- Application.RunOnMainThread(() =>
- {
- new Tip()
- {
- CloseTime = 1,
- Direction = AMPopTipDirection.None,
- Text = erorrInfo,
- }.Show(bodyView);
- });
+ //澶辫触鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Check, resultObj.Code);
}
Application.RunOnMainThread(() =>
{
@@ -548,11 +529,12 @@
{
if (optionType == 1)
{
- var result = new DAL.Server.HttpServerRequest().GetLoginVerCode(MainPage.LoginUser.userEmailInfo);
+ var resultObj = new DAL.Server.HttpServerRequest().VerificationCodeSend(VerifyType.FIND_PASSWORD, MainPage.LoginUser.userEmailInfo);
+
}
else if (optionType == 2)
{
- var result = new DAL.Server.HttpServerRequest().GetLoginVerCode(MainPage.LoginUser.userMobileInfo);
+ var resultObj = new DAL.Server.HttpServerRequest().VerificationCodeSend(VerifyType.FIND_PASSWORD, MainPage.LoginUser.userMobileInfo, true, MainPage.LoginUser.areaCode.ToString() );
}
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0