JLChen
2020-11-13 017af840d60fd6a56da9711308bf8239cb7fc1e6
HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -164,6 +164,10 @@
        /// 1:邮箱
        /// </summary>
        int registerType;
        /// <summary>
        /// 手机区号
        /// </summary>
        string phoneZoneCode = "86";
        string registerPhone;
        string registerEmail;
@@ -239,12 +243,25 @@
                X = Application.GetRealWidth(9),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                Text = "+86",
                Text = "+" + phoneZoneCode,
                TextSize = CSS_FontSize.TextFontSize,
            };
            if (accountType == 0)
            {
                accountView.AddChidren(btnGlobalRoaming);
                EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                    JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                        if (!string.IsNullOrEmpty(code))
                        {
                            phoneZoneCode = code;
                            btnGlobalRoaming.Text = "+" + phoneZoneCode;
                        }
                    });
                };
                btnGlobalRoaming.MouseUpEventHandler += eHandler;
            }
            //btnDividingLineVertical_AccountView = new Button()
@@ -660,51 +677,30 @@
            var result = false;
            //调用登录接口
            var loginResult = pm.LoginByPassword(account, password);
            if (loginResult.StateCode.ToUpper() == "SUCCESS")
            if (loginResult.Code == HttpUtil.SUCCESS_CODE)
            {
                var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
                //记录用户数据
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
                MainPage.LoginUser = new UserInfo
                {
                    ID = (int)loginDataStr.GetValue("UserID"),
                    masterID = (int)loginDataStr.GetValue("MainUserID"),
                    accountType = (int)loginDataStr.GetValue("UserType"),
                    userType = revertData.userType,
                    accountString = account,
                    password = password,
                    lastTime = DateTime.Now,
                    userName = loginDataStr.GetValue("Remark").ToString(),
                    ID = revertData.userId,
                    loginTokenString = revertData.headerPrefix + revertData.accessToken,
                    refreshToken = revertData.refreshToken,
                    userName = revertData.name
                };
                MainPage.LoginUser.SaveUserInfo();
                MainPage.Log("登录成功。");
                result = true;
            }
            //登录失败
            else
            {
                string tipStr = "Sever erorr";
                switch (loginResult.StateCode)
                {
                    case "USERNAMEORPWDERROR":
                        tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                        break;
                    case "Self:Net_Error":
                        tipStr = Language.StringByID(StringId.NetworkAnomaly);
                        break;
                }
                //账号或者密码错误
                //登录失败
                IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Login, loginResult.Code);
                Application.RunOnMainThread(() =>
                {
                    //提示原因
                    var tip = new Tip()
                    {
                        Text = tipStr,
                        CloseTime = 1,
                        Direction = AMPopTipDirection.None
                    };
                    tip.Show(bodyView);
                    btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                });
@@ -719,7 +715,7 @@
        {
            var result = false;
            var responsePack = pm.GetHomePager();
            if (responsePack == "Success")
            if (responsePack == HttpUtil.SUCCESS_CODE)
            {
            }
            else