1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs

@@ -16,6 +16,10 @@
        FrameLayout bodyView;
        Button btnBind;
        EditText etContent;

        /// <summary>
        /// 
        /// </summary>
        Action<string> action;

        /// <summary>
@@ -30,7 +34,6 @@
        /// 是否换绑
        /// </summary>
        bool isModifyBind;

        /// <summary>
        /// 手机区号
        /// </summary>
@@ -57,7 +60,7 @@
            if (isModifyBind)
            {
                //修改绑定
                titleId = isPhone ? StringId.ModifyBindingPhone : StringId.ModifyBindingEmail;
                titleId = isPhone ? StringId.EntryNewPhone : StringId.EntryNewEmail;
            }
            else
            {
@@ -66,19 +69,58 @@
            }
         
            

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();

            if (isPhone)
            {
                AddPhoneFrameLayout();
            }
            else
            {
                AddEmailFrameLayout();
            }

            //点击获取验证码
            LoadEvent_GetVerification(btnBind);
           
        }

        /// <summary>
        /// 
        /// </summary>
        void AddPhoneFrameLayout() {
            #region 如果是手机
            //手机国家区号选择按钮
            ListCellView codeView = new ListCellView() {
                Y = Application.GetRealHeight(64),
            };
            bodyView.AddChidren(codeView);
            //跳转国家区号选择界面
            Action selectAction = () =>
            {
                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                    if (!string.IsNullOrEmpty(code))
                    {
                        phoneZoneCode = code;
                        codeView.BtnSubtitle.Text = "+" + phoneZoneCode;
                    }
                });
            };
            codeView.GoAction = selectAction;
            codeView.BtnTilte.Text = Language.StringByID(StringId.CountryOrRegion);
            codeView.BtnSubtitle.Text = "+" + phoneZoneCode;

            //手机号输入框
            FrameLayout rowView = new FrameLayout()
            {
                Y = Application.GetRealHeight(72),
                Y = codeView.Bottom,
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(rowView);

            //绑定邮箱或者绑定手机号
            //绑定手机号
            Button btnTitle = new Button()
            {
                X = Application.GetRealWidth(16),
@@ -105,7 +147,7 @@
                Y = Application.GetRealHeight(213),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealHeight(44),
                Height = Application.GetRealWidth(44),
                BackgroundColor = CSS_Color.MainColor,
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.MainBackgroundColor,
@@ -117,11 +159,65 @@
                BorderWidth = 0,
            };
            bodyView.AddChidren(btnBind);

            //点击获取验证码
            LoadEvent_GetVerification(btnBind);
           
            #endregion
        }

        /// <summary>
        /// 
        /// </summary>
        void AddEmailFrameLayout()
        {
            #region 如果是邮箱
            FrameLayout rowView = new FrameLayout()
            {
                Y = Application.GetRealHeight(72),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(rowView);

            //绑定邮箱
            Button btnTitle = new Button()
            {
                X = Application.GetRealWidth(16),
                Width = Application.GetRealWidth(180),
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextAlignment = TextAlignment.CenterLeft,
                TextID = titleId,
            };
            rowView.AddChidren(btnTitle);

            etContent = new EditText()
            {
                Width = Application.GetRealWidth(359),
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
                TextAlignment = TextAlignment.CenterRight,
                Foucs = true
            };
            rowView.AddChidren(etContent);

            btnBind = new Button()
            {
                Y = Application.GetRealHeight(213),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealWidth(44),
                BackgroundColor = CSS_Color.MainColor,
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.MainBackgroundColor,
                TextID = StringId.GetVerificationCode,
                TextSize = CSS_FontSize.SubheadingFontSize,
                IsBold = true,
                Radius = (uint)Application.GetRealWidth(22),
                BorderColor = 0x00000000,
                BorderWidth = 0,
            };
            bodyView.AddChidren(btnBind);
            #endregion
        }

    }


@@ -139,6 +235,32 @@
                {
                    Application.HideSoftInput();
                    var account = etContent.Text.Trim();

                    //如果是换绑检测是否相同帐号
                    if (isModifyBind)
                    {
                        if (isPhone)
                        {
                            if(account == UserInfo.Current.userMobileInfo)
                            {
                                //提示换绑帐号相同
                                Utlis.ShowTip(Language.StringByID(StringId.EntryNewPhone));
                                return;
                            }
                        }
                        else
                        {
                            if (account == UserInfo.Current.userEmailInfo)
                            {
                                //提示换绑帐号相同
                                Utlis.ShowTip(Language.StringByID(StringId.EntryNewEmail));
                                return;
                            }

                        }
                    }


                    #region 正则表达式
                    //1.检测账号是否合法
                    if (!isPhone)
@@ -208,7 +330,7 @@
                            {
                                button.BackgroundColor = CSS_Color.PromptingColor1;
                                var vcp = new NewBindVerificationCodePage();
                                vcp.phoneZoneCode = phoneZoneCode;
                                vcp.PhoneZoneCode = phoneZoneCode;
                                MainPage.BasePageView.AddChidren(vcp);
                                vcp.LoadPage(action, titleId, account, isPhone, time, isModifyBind);
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;