JLChen
2020-11-16 d6f398b6b07315d327be2994081eb31ae100ba03
2020-11-16 1.更新备份
14个文件已修改
557 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpServerRequest.cs 189 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/IMessageCommon.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewAPI.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewApiRes.cs 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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>
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=系统维护中,请稍后再试!
HDL_ON/Common/R.cs
@@ -432,6 +432,11 @@
        /// 请求服务器失败,请稍后再试!
        /// </summary>
        public const int FailedRequestServer = 10001;
        /// <summary>
        ///  系统维护中 ~请稍后再试~
        /// </summary>
        public const int SystemMaintenance = 10002;
        #endregion
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,31 +311,28 @@
        /// <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();
                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)
                {
                    MainPage.LoginUser.headImagePageBytes = headImageBytes;
                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)
                {
@@ -359,18 +345,71 @@
                        fs.Close();
                    }
                }
                // "GesturePwd": null,  < !--手势密码-- >
                // "StringPwd": null , < !--字符串密码-- >
                MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
                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>
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;
            //账号不存在
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 -- 住宅管理接口___________________________
HDL_ON/DAL/Server/NewApiRes.cs
@@ -6,11 +6,17 @@
    #region  **************************************新服务器**************************************
    [System.Serializable]
    public class Base3NoTokenObj
    public class BaseNoTokenObj
    {
        //public string RequestVersion = MainPage.CodeIDString;
        ////请求来源
        //public string clientType = MainPage.ClientType;
    }
    [System.Serializable]
    public class NullObj
    {
    }
@@ -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>
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -4,6 +4,7 @@
namespace HDL_ON.Entity
{
    /// <summary>
    /// 2020-11-16 待修改调整
    /// 住宅成员的信息列表
    /// </summary>
    public class ResidenceMemberInfo
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();
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();
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(() =>
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(() =>
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)
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();