From 8c1bf42c5fca66625b59728006bd47bae0b6a3ad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:18:16 +0800
Subject: [PATCH] Revert "Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL"
---
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs
index d2e3ef1..84e9419 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs
@@ -93,7 +93,7 @@
{
if (verificationOption == 0)
{
- if (string.IsNullOrEmpty(MainPage.LoginUser.userMobileInfo))
+ if (string.IsNullOrEmpty( UserInfo.Current.userMobileInfo))
{
LoadDialog_UnbindTipInfo(verificationOption);
}
@@ -102,13 +102,13 @@
this.RemoveFromParent();
var vcp = new ResetPasswordVerificationCodePage();
MainPage.BasePageView.AddChidren(vcp);
- vcp.LoadPage(StringId.PhoneNumberVerification,2);
+ vcp.LoadPage(StringId.PhoneNumberVerification, true, UserInfo.Current.userMobileInfo);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
}
else
{
- if (string.IsNullOrEmpty(MainPage.LoginUser.userEmailInfo))
+ if (string.IsNullOrEmpty( UserInfo.Current.userEmailInfo))
{
LoadDialog_UnbindTipInfo(verificationOption);
}
@@ -117,7 +117,7 @@
this.RemoveFromParent();
var vcp = new ResetPasswordVerificationCodePage();
MainPage.BasePageView.AddChidren(vcp);
- vcp.LoadPage(StringId.EmailVerification,1);
+ vcp.LoadPage(StringId.EmailVerification, false, UserInfo.Current.userEmailInfo);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
}
@@ -134,17 +134,8 @@
dialogView.MouseUpEventHandler = (sender, e) => {
dialog.Close();
};
-
- Button btnTitleIcon = new Button()
- {
- X = Application.GetRealWidth(108),
- Y = Application.GetRealWidth(152),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealWidth(160),
- UnSelectedImagePath = "PersonalCenter/ResetPassword/DialogTipTitleIcon.png"
- };
- dialogView.AddChidren(btnTitleIcon);
-
+ dialog.AddChidren(dialogView);
+
FrameLayout contentView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
@@ -156,6 +147,19 @@
};
dialogView.AddChidren(contentView);
+ Button btnTitleIcon = new Button()
+ {
+ X = Application.GetRealWidth(108),
+ Y = Application.GetRealWidth(152),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealWidth(160),
+ UnSelectedImagePath = "PersonalCenter/ResetPassword/DialogTipTitleIcon.png"
+ };
+ dialogView.AddChidren(btnTitleIcon);
+ btnTitleIcon.MouseUpEventHandler = (sender, e) => {
+ dialog.Close();
+ };
+
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -164,7 +168,7 @@
Height = Application.GetRealWidth(62),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = verificationOption == 0?StringId.UnBindPhoneNumberCannotVerification: StringId.UnBindEmailCannotVerification,
+ TextID = verificationOption == 0 ? StringId.UnBindPhoneNumberCannotVerification: StringId.UnBindEmailCannotVerification,
};
contentView.AddChidren(btnMsg);
@@ -177,7 +181,7 @@
TextAlignment = TextAlignment.Center,
Radius = (uint)Application.GetRealWidth(22),
BackgroundColor = CSS_Color.MainColor,
- TextID = StringId.PhoneNumberVerification,
+ TextID = StringId.GoBind,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
};
@@ -187,10 +191,20 @@
{
dialog.Close();
Action<string> action = (obj) => { };
- var vcp = new BindAccountPage();
- MainPage.BasePageView.AddChidren(vcp);
- vcp.LoadPage(action, verificationOption == 0 ? StringId.BindPhone : StringId.BindEmail);
+ //var vcp = new BindAccountPage();
+ //MainPage.BasePageView.AddChidren(vcp);
+ //vcp.LoadPage(action, verificationOption == 0 ? StringId.BindPhone : StringId.BindEmail);
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ //鏄惁涓烘崲缁戞墜鏈�
+ var isPhone = verificationOption == 0;
+ //璺宠浆鏂扮粦瀹氶〉闈�
+ var aep = new NewBindAccountPage();
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage(action, isPhone);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+
};
dialog.Show();
--
Gitblit v1.8.0