202009101

wxr

2020-09-10 af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b

 HDL_ON/UI/UI1-Login/RegisterPage.cs

@@ -119,7 +119,11 @@
        /// <summary>
        /// 获取验证码按钮
        /// </summary>
        Button btnGetVerificationCode;
        Button btnGetVerificationCode_Phone;
        /// <summary>
        /// 获取验证码按钮
        /// </summary>
        Button btnGetVerificationCode_Mail;
        /// <summary>
        /// 验证码子区域底部分割线
        /// </summary>
@@ -160,6 +164,9 @@
        /// 1:邮箱
        /// </summary>
        int registerType;

        string registerPhone;
        string registerEmail;
        #endregion
        public RegisterPage()
        {
@@ -195,7 +202,7 @@
                Y = Application.GetRealHeight(112),
                Width = Application.GetRealWidth(120),
                Height = Application.GetRealHeight(40),
                TextID = StringId.LoginByPhone,
                TextID = StringId.RegisterByPhone,
                TextColor = CSS_Color.MainColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
@@ -208,7 +215,7 @@
                Y = Application.GetRealHeight(112),
                Width = Application.GetRealWidth(100),
                Height = Application.GetRealHeight(40),
                TextID = StringId.LoginByEmail,
                TextID = StringId.RegisterByEmail,
                TextColor = CSS_Color.PromptingColor1,
                TextAlignment = TextAlignment.Center,
                TextSize = CSS_FontSize.TextFontSize,
@@ -460,7 +467,7 @@
            };
            verificationCodeView.AddChidren(etVerificationCode);

            btnGetVerificationCode = new Button()
            btnGetVerificationCode_Phone = new Button()
            {
                X = Application.GetRealWidth(219),
                Width = Application.GetRealWidth(100),
@@ -470,7 +477,20 @@
                TextAlignment = TextAlignment.CenterRight,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            };
            verificationCodeView.AddChidren(btnGetVerificationCode);
            verificationCodeView.AddChidren(btnGetVerificationCode_Phone);

            btnGetVerificationCode_Mail = new Button()
            {
                X = Application.GetRealWidth(219),
                Width = Application.GetRealWidth(100),
                TextID = StringId.GetVerificationCode,
                SelectedTextColor = CSS_Color.MainColor,
                TextColor = CSS_Color.PromptingColor1,
                TextAlignment = TextAlignment.CenterRight,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Visible = false
            };
            verificationCodeView.AddChidren(btnGetVerificationCode_Mail);

            btnVerificationCodeViewBottomLine = new Button()
            {
@@ -584,6 +604,7 @@
                    var loginThread = LoadThread_Login(account, password);
                    waitPage = new Loading();
                    new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
                    dialog.Close();
                });
            })
            { IsBackground = true }.Start();
@@ -639,7 +660,7 @@
            var result = false;
            //调用登录接口
            var loginResult = pm.LoginByPassword(account, password);
            if (loginResult.StateCode == "SUCCESS")
            if (loginResult.StateCode.ToUpper() == "SUCCESS")
            {
                var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);

@@ -652,7 +673,6 @@
                    accountString = account,
                    password = password,
                    lastTime = DateTime.Now,
                    SIP_Account = loginDataStr.GetValue("AllVisionRegisterDevUserNameGuid").ToString(),
                    userName = loginDataStr.GetValue("Remark").ToString(),
                };
                MainPage.LoginUser.SaveUserInfo();
@@ -681,7 +701,7 @@
                    var tip = new Tip()
                    {
                        Text = tipStr,
                        CloseTime = 3,
                        CloseTime = 1,
                        Direction = AMPopTipDirection.None
                    };
                    tip.Show(bodyView);
@@ -699,38 +719,13 @@
        {
            var result = false;
            var responsePack = pm.GetHomePager();
            if (responsePack.StateCode == "Success")
            if (responsePack == "Success")
            {
                var dataStr = Newtonsoft.Json.Linq.JObject.FromObject(responsePack.ResponseData);
                //没有住宅
                if (dataStr.GetValue("PageData").ToString() == "[]")
                {

                }
                else
                {
                    MainPage.LoginUser.regionList = new List<RegionInfoRes>();
                    foreach (var jsonData in dataStr.GetValue("PageData"))
                    {
                        var homeJsonStr = Newtonsoft.Json.Linq.JObject.FromObject(jsonData);
                        var home = new RegionInfoRes()
                        {
                            RegionID = homeJsonStr.GetValue("Id").ToString(),
                            RegionName = homeJsonStr.GetValue("RegionName").ToString(),
                            Name = homeJsonStr.GetValue("Name").ToString(),
                        };
                        MainPage.LoginUser.regionList.Add(home);
                    }
                    DB_ResidenceData.residenceData.residecenInfo = MainPage.LoginUser.regionList[0];
                    OnAppConfig.Instance.SaveUserConfig();
                    MainPage.LoginUser.SaveUserInfo();
                }
                result = true;
            }
            else
            {
                var tipStr = "Server erorr";
                switch (responsePack.StateCode)
                switch (responsePack)
                {
                    case "NoLogin":
                        tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
@@ -742,7 +737,7 @@
                    var tip = new Tip()
                    {
                        Text = tipStr,
                        CloseTime = 3,
                        CloseTime = 1,
                        Direction = AMPopTipDirection.None
                    };
                    tip.Show(bodyView);