Merge branch 'CJL'

wxr

2020-11-20 387383a243879bf8c63a4611e2ed2c5a519e218d

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -1,4 +1,5 @@
using System;
using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.DAL.Server;
using HDL_ON.UI.CSS;
@@ -144,18 +145,23 @@

        string verAccount = "";

        public void VerfifyLogin(string account ) 
        {
            verAccount = account;
            LoadView(account);
        }
        /// <summary>
        /// 
        /// </summary>
        string registerPhone;
        string registerEmail;
        /// <summary>
        /// 手机区号
        /// </summary>
        string phoneZoneCode = "86";

        /// <summary>
        /// 加载视图
        /// </summary>
        public void LoadView(string account = "")
        public void LoadView(UserInfo userInfo = null)
        {
            Language.CurrentLanguage = "Chinese";

            var btnIcon = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -179,7 +185,7 @@
            btnIcon.MouseUpEventHandler += (sender, e) =>
            {
#if DEBUG
                etAccount.Text = "464027401@qq.com";
                etAccount.Text = "464027401@qq.com"; //"2791308028@qq.com";// 
                etPassword.Text = "qqqqqq";
                btnLogin.IsSelected = true;
#endif
@@ -228,11 +234,27 @@
                Width = Application.GetRealWidth(65),
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                Text = "+86",
                Text = "+" + phoneZoneCode,
                TextSize = CSS_FontSize.TextFontSize,
                Enable = true,
            };

            //跳转国家区号选择界面
            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                    if (!string.IsNullOrEmpty(code))
                    {
                        phoneZoneCode = code;
                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
                    }
                });
            };
            btnGlobalRoaming.MouseUpEventHandler += eHandler;

            if (loginType == 0)
            {
                accountView.AddChidren(btnGlobalRoaming);
            }

            btnDividingLineVertical_AccountView = new Button()
            {
@@ -256,9 +278,10 @@
            };
            accountView.AddChidren(etAccount);

            if (account != "")
            if (userInfo != null)
            {
                etAccount.Text = account;
                registerEmail = userInfo.userEmailInfo;
                etAccount.Text = registerPhone = userInfo.userMobileInfo;
            }

            btnAccountViewBottomLine = new Button()
@@ -437,7 +460,7 @@
            LoadEventList();
            account = etAccount.Text.Trim();

            #if DEBUG
            #if DEBUG1211
            //本地模式
            Button btnLocalMode = new Button()
            {