Merge branch 'CJL-NEW'

wxr

2020-12-08 273bd8b4fb918a4303207215b2b8369fbc275000

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -84,9 +84,15 @@
                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                        return;
                    }
                    //加载Loading效果
                    var waitPage = new Loading();
                    bodyView.AddChidren(waitPage);
                    waitPage.Start(Language.StringByID(StringId.PleaseWait));

                    int time = 60;
                    new Thread(() =>
                    {
                        try
                    {
                        //1.先检查账号是否注册过
                        var result = pm.GetRegionByAccount(account);
@@ -142,7 +148,19 @@
                                { IsBackground = true }.Start();
                            }
                        }

                        }
                        catch { }
                        finally
                        {
                            Application.RunOnMainThread(() =>
                            {
                                if (waitPage != null)
                                {
                                    waitPage.RemoveFromParent();
                                    waitPage = null;
                                }
                            });
                        }
                    })
                    { IsBackground = true }.Start();

@@ -151,12 +169,12 @@
        }

        /// <summary>
        /// 切换登录类型
        /// 
        /// </summary>
        void LoadPage_SwitchLoginType()
        /// <param name="type">是否选择手机登录</param>
        void LoginTypeChange(bool isPhone)
        {
            //选择手机登录
            btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
            if(isPhone)
            {
                if (loginType == 0)
                    return;
@@ -209,11 +227,8 @@
                    etPassword.SecureTextEntry = false;
                }
                #endregion

            };

            //选择邮箱登录
            btnEmailLogin.MouseUpEventHandler += (sender, e) =>
            }
            else
            {
                if (loginType == 1)
                    return;
@@ -254,18 +269,32 @@
                etPassword.SecureTextEntry = true;
                //隐藏验证码登录方式，邮箱登录没有验证码登录
                btnSwitchLoginMode.Visible = false;
            }
        }

        /// <summary>
        /// 切换登录类型
        /// </summary>
        void LoadPage_SwitchLoginType()
        {
            //选择手机登录
            btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
            {
                LoginTypeChange(true);
            };

            //选择邮箱登录
            btnEmailLogin.MouseUpEventHandler += (sender, e) =>
            {
                LoginTypeChange(false);
            };
        }

        /// <summary>
        /// 切换登录方式
        /// 验证码/密码
        /// 切换登录方式 验证码/密码
        /// </summary>
        void LoadPage_SwitchLoginMode()
        void LoginModeChange()
        {
            btnSwitchLoginMode.MouseUpEventHandler = (sender, e) =>
            {
                logintMode = logintMode == 0 ? 1 : 0;
                //清除密码框文本数据
                etPassword.Text = "";
                //密码登录
@@ -312,6 +341,18 @@
                    //验证码不需要隐藏
                    etPassword.SecureTextEntry = false;
                }
        }

        /// <summary>
        /// 切换登录方式
        /// 验证码/密码
        /// </summary>
        void LoadPage_SwitchLoginMode()
        {
            btnSwitchLoginMode.MouseUpEventHandler = (sender, e) =>
            {
                logintMode = logintMode == 0 ? 1 : 0;
                LoginModeChange();
            };
        }

@@ -696,7 +737,7 @@
                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    else if (loginResult.Code == "14")
                    else if (loginResult.Code == StateCode.VERIFICATION_CODE_WRONG)
                    {
                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
@@ -740,25 +781,22 @@
        {
            btnRegister.MouseUpEventHandler += (sender, e) =>
            {
                //回调事件
                //Action callBackAction = () =>
                //{
                //    Application.RunOnMainThread(() =>
                //    {
                //        try
                //        {
                //        }
                //        catch (Exception ex)
                //        {
                //            MainPage.Log($"login callBackAction : {ex.Message}");
                //        }
                //    });
                //};

                //判断是否同意了隐私政策
                if (CheckPrivacyPolicy() == false) return;

                var registerPage = new RegisterPage();
                Action<string, string, bool> autoLoginAction = (account, password, isPhone) =>
                {
                    try
                    {
                        AutoLoginAction(account, password, isPhone);
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"login callBackAction : {ex.Message}");
                    }
                };

                var registerPage = new RegisterPage(autoLoginAction);
                registerPage.Show();
                registerPage.ShowDialog();
            };
@@ -771,21 +809,22 @@
        {
            btnForgetPassword.MouseUpEventHandler += (sender, e) =>
            {
                Action<string> callBackAction = (callBackPar_Action) =>
                //判断是否同意了隐私政策
                if (CheckPrivacyPolicy() == false) return;

                Action<string, string, bool> autoLoginAction = (account, password, isPhone) =>
                {
                    Application.RunOnMainThread(() =>
                    {

                        try
                        {
                            etAccount.Text = callBackPar_Action;
                        AutoLoginAction(account, password, isPhone);
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"login callBackAction : {ex.Message}");
                        }
                    });
                };
                var forgetPasswordDialog = new ForgetPasswordPage(callBackAction);
                var forgetPasswordDialog = new ForgetPasswordPage(autoLoginAction);
                forgetPasswordDialog.Show();
                forgetPasswordDialog.ShowDialog();

@@ -804,5 +843,30 @@
                btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
            });
        }

        /// <summary>
        /// 自动登录回调事件
        /// </summary>
        /// <param name="mAccount"></param>
        /// <param name="mPassword"></param>
        /// <param name="isPhone"></param>
        void AutoLoginAction(string mAccount, string mPassword, bool isPhone)
        {
            //切换回手机或者邮箱登录
            LoginTypeChange(isPhone);
            //切换回密码登录1
            logintMode = 0;
            //切换回密码登录2
            LoginModeChange();
            //设置账户名和密码
            etAccount.Text = account;
            etPassword.Text = password;
            this.account = mAccount;
            this.password = mPassword;
            //创建登录线程
            var loginThread = LoadThread_Login();
            waitPage = new Loading();
            new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
        }
    }
}