Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/UI/UI1-Login/RegisterPage.cs

@@ -245,6 +245,8 @@
                {
                    OnAppConfig.Instance.GlobalRegion.regionUrl = "";
                }
                getServerList();

            }catch(Exception ex)
            {
                MainPage.Log("Error", "进入注册界面AppConfig异常：" + ex.Message);
@@ -271,8 +273,7 @@
                Application.HideSoftInput();
            };

            new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)).LoadTopView(backAction);
            //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.Register));
            new TopViewDiv(this, bodyView, Language.StringByID(StringId.Register)) { maginY = 10 }.LoadTopView(backAction);

            #region 注册方式选择
            btnPhoneLogin = new Button()
@@ -758,10 +759,7 @@
                Thread.Sleep(1500);
                Application.RunOnMainThread(() =>
                {
                    ////创建登录线程
                    //var loginThread = LoadThread_Login(account, password);
                    //waitPage = new Loading();
                    //new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
                    //创建登录线程
                    dialog.Close();

                    var isPhone = registerType == 0;
@@ -771,117 +769,5 @@
            { IsBackground = true }.Start();
        }

        //#region 登录线程部分
        ///// <summary>
        ///// 加载登录线程
        ///// </summary>
        //Thread LoadThread_Login(string account,string password)
        //{
        //    var loginThread = new Thread(() =>
        //    {
        //        try
        //        {
        //            //登录
        //            var loginResult = LoadMethod_Login(account,password);
        //            if (loginResult)
        //            {
        //                //获取住宅信息
        //                var getResidencesResult = LoadMethod_GetResidences();
        //                if (getResidencesResult)
        //                {
        //                    /*
        //                     * Wait : 推送注册
        //                     */

        //                    Application.RunOnMainThread(() =>
        //                    {
        //                        waitPage.RemoveFromParent();
        //                        waitPage = null;

        //                        //跳转页面----
        //                        MainPage.GoUserPage();
        //                    });
        //                }
        //            }
        //        }
        //        catch (Exception ex)
        //        {
        //            MainPage.Log($"LoginPage : {ex.Message}");
        //        }
        //    })
        //    { IsBackground = true };
        //    return loginThread;
        //}

        ///// <summary>
        ///// 调用登录接口登录
        ///// </summary>
        //bool LoadMethod_Login(string account, string password)
        //{
        //    var result = false;
        //    //调用登录接口
        //    var loginResult = pm.LoginByPassword(account, password);
        //    if (loginResult.Code == StateCode.SUCCESS)
        //    {
        //        var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
        //        // UserInfo.Current = new UserInfo
        //        //{
        //        //    userType = revertData.userType,
        //        //    accountString = account,
        //        //    password = password,
        //        //    lastTime = DateTime.Now,
        //        //    ID = revertData.userId,
        //        //    loginTokenString = revertData.headerPrefix + revertData.accessToken,
        //        //    refreshToken = revertData.refreshToken,
        //        //    userName = revertData.name
        //        //};
        //        UserInfo.Current.userType = revertData.userType;
        //        UserInfo.Current.AccountString = account;
        //        //UserInfo.Current.password = password;
        //        UserInfo.Current.LastTime = DateTime.Now;
        //        UserInfo.Current.ID = revertData.userId;
        //        UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
        //        UserInfo.Current.RefreshToken = revertData.refreshToken;
        //        UserInfo.Current.userName = revertData.name;

        //        UserInfo.Current.SaveUserInfo();
        //        MainPage.Log("登录成功。");
        //        result = true;
        //    }
        //    else
        //    {
        //        //登录失败
        //        IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
        //        Application.RunOnMainThread(() =>
        //        {
        //            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
        //            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
        //        });
        //    }
        //    return result;
        //}

        ///// <summary>
        ///// 获取住宅列表
        ///// </summary>
        //bool LoadMethod_GetResidences()
        //{
        //    var result = false;
        //    var responsePack = pm.GetHomePager();
        //    if (responsePack == StateCode.SUCCESS)
        //    {
        //        //2020-11-13 待确认，没有住宅，不算登录成功
        //        if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
        //        {
        //            result = true;
        //        }
        //    }
        //    else
        //    {
        //        IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
        //    }
        //    return result;
        //}
        //#endregion
    }
}