From 273bd8b4fb918a4303207215b2b8369fbc275000 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:58:44 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 264 ++++++++++++++++++++++++++++++----------------------
1 files changed, 154 insertions(+), 110 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index 25b6fc5..e04a6a4 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -317,65 +317,89 @@
var account = etAccount.Text.Trim();
if ((sender as Button).IsSelected)
{
+ //鍔犺浇Loading鏁堟灉
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
int time = 60;
new Thread(() =>
{
- //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
- var result = pm.GetRegionByAccount(account);
- if (result.Code != StateCode.SUCCESS)
+ try
{
- IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
- return;
- }
- else
- {
- //2.1妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
- CheckAndSetUserRequestHost(result);
-
- //2.2宸茬粡娉ㄥ唽杩囷紝鍙戦�侀獙璇佺爜鎵惧洖瀵嗙爜
- Application.RunOnMainThread(() =>
+ //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
+ var result = pm.GetRegionByAccount(account);
+ if (result.Code != StateCode.SUCCESS)
{
- //鐭俊鍙戦�侀棿闅�60s
- (sender as Button).IsSelected = false;
- etVerificationCode.Foucs = true;
- });
- //2.1鑾峰彇楠岃瘉鐮佸�掕鏃�
- new Thread(() =>
- {
- while (time > 0)
- {
- time--;
- Application.RunOnMainThread(() =>
- {
- (sender as Button).Text = time.ToString() + "s";
- });
- Thread.Sleep(1000);
- }
- Application.RunOnMainThread(() =>
- {
- //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
- (sender as Button).IsSelected = true;
- (sender as Button).TextID = StringId.GetVerificationCode;
- });
- })
- { IsBackground = true }.Start();
-
- ResponsePackNew resultObj;
- //2.1璇锋眰鑾峰彇楠岃瘉鐮�
- if (registerType == 1)//閭
- {
- resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account);
+ IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ return;
}
else
{
- resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account, true, phoneZoneCode);
- }
- if (resultObj.Code != StateCode.SUCCESS)
- {
- // 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ //2.1妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
+ CheckAndSetUserRequestHost(result);
+ //2.2宸茬粡娉ㄥ唽杩囷紝鍙戦�侀獙璇佺爜鎵惧洖瀵嗙爜
+ ResponsePackNew resultObj;
+ //2.3璇锋眰鑾峰彇楠岃瘉鐮�
+ if (registerType == 1)//閭
+ {
+ resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account);
+ }
+ else
+ {
+ resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account, true, phoneZoneCode);
+ }
+
+ if (resultObj.Code != StateCode.SUCCESS)
+ {
+ // 鎻愮ず閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ }
+ else
+ {
+ //3.鍙戦�侀獙璇佺爜鎴愬姛锛屽紑濮嬭鏃�
+ Application.RunOnMainThread(() =>
+ {
+ //鐭俊鍙戦�侀棿闅�60s
+ (sender as Button).IsSelected = false;
+ etVerificationCode.Foucs = true;
+ });
+ //2.1鑾峰彇楠岃瘉鐮佸�掕鏃�
+ new Thread(() =>
+ {
+ while (time > 0)
+ {
+ time--;
+ Application.RunOnMainThread(() =>
+ {
+ (sender as Button).Text = time.ToString() + "s";
+ });
+ Thread.Sleep(1000);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
+ (sender as Button).IsSelected = true;
+ (sender as Button).TextID = StringId.GetVerificationCode;
+ });
+ })
+ { IsBackground = true }.Start();
+
+ }
}
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
}
})
{ IsBackground = true }.Start();
@@ -428,19 +452,29 @@
{
Application.RunOnMainThread(() =>
{
- LoadEvent_AutoLogin();
- callbackAction?.Invoke(account);
+ if (waitPage != null)
+ {
+ waitPage.Hide();
+ }
+ ShowAutoLoginDialog(account, password, isPhone);
});
}
else
{
- // 2020-11-13 寰呬慨鏀� 楠岃瘉鐮侀敊璇� 璀﹀憡鎻愮ず
- //btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- //btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.Hide();
+ }
+
+ // 楠岃瘉鐮侀敊璇� 璀﹀憡鎻愮ず
+ if (resultObj.Code == StateCode.VERIFICATION_CODE_WRONG)
+ {
+ btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
+ }
});
// 鎻愮ず閿欒
IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
@@ -464,89 +498,99 @@
}
/// <summary>
- /// 浣忓畢鎴愬姛涔嬪悗鑷姩鐧诲綍
+ /// 鏄剧ず鑷姩鑷姩鐧诲綍浜嬩欢
/// </summary>
- void LoadEvent_AutoLogin()
+ void ShowAutoLoginDialog(string account, string password, bool isPhone)
{
Dialog dialog = new Dialog();
- FrameLayout frame = new FrameLayout()
+ FrameLayout dialogView = new FrameLayout();
+ dialogView.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ };
+ dialog.AddChidren(dialogView);
+
+ FrameLayout contentView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(198),
+ Y = Application.GetRealWidth(200),
Width = Application.GetRealWidth(288),
- Height = Application.GetRealHeight(206),
+ Height = Application.GetRealWidth(270),
+ Radius = (uint)Application.GetRealWidth(6),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(12),
- BorderWidth = 0,
- BorderColor = 0x00000000,
};
- dialog.AddChidren(frame);
+ dialogView.AddChidren(contentView);
- Button btnAccountText = new Button()
+ contentView.Y = (dialogView.Height - contentView.Height) / 2;
+
+ Button btnTitleIcon = new Button()
+ {
+ X = Application.GetRealWidth(108),
+ Y = contentView.Y - Application.GetRealWidth(71),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealWidth(160),
+ UnSelectedImagePath = "Public/Dialog/DialogTipTitleIcon_1.png"
+ };
+ dialogView.AddChidren(btnTitleIcon);
+ btnTitleIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ };
+
+ Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(40),
- Height = Application.GetRealHeight(17 + 14 + 14),
- IsMoreLines = true,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- //Text = "s鏄敓鐢熶笘涓�",
- };
- frame.AddChidren(btnAccountText);
-
- Button btnTipRegisterSuccess = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(123),
- Height = Application.GetRealHeight(30),
- TextAlignment = TextAlignment.Center,
+ Y = Application.GetRealWidth(88),
+ Width = Application.GetRealWidth(220),
+ Height = Application.GetRealWidth(44),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.PasswordChangeSuccessfully,
+ TextID = StringId.ModifySuccess
};
- frame.AddChidren(btnTipRegisterSuccess);
+ contentView.AddChidren(btnMsg);
- Button btnAutoLoginTip = new Button()
+ Button btnMsg2 = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = btnTipRegisterSuccess.Bottom,
- Height = Application.GetRealHeight(17 + 8),
- TextAlignment = TextAlignment.Center,
+ Y = btnMsg.Bottom + Application.GetRealWidth(8),
+ Width = Application.GetRealWidth(220),
+ Height = Application.GetRealWidth(60),
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.AutomaticallyLogin,
+ TextID = StringId.YourPasswordHasBeenChanged,
+ TextAlignment = TextAlignment.TopCenter,
+ IsMoreLines = true
};
- //frame.AddChidren(btnAutoLoginTip);
+ contentView.AddChidren(btnMsg2);
- Button btnHeadImage = new Button()
+
+ Button btnSkipBindPage = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(150),
- Width = Application.GetRealWidth(84),
- Height = Application.GetRealWidth(84),
- Radius = (uint)Application.GetRealHeight(42),
- BorderColor = 0x00000000,
- BorderWidth = 0,
- UnSelectedImagePath = "LoginIcon/2.png",
+ Y = Application.GetRealWidth(194),
+ Width = Application.GetRealWidth(220),
+ Height = Application.GetRealWidth(44),
+ TextAlignment = TextAlignment.Center,
+ Radius = (uint)Application.GetRealWidth(22),
+ BackgroundColor = CSS_Color.MainColor,
+ TextID = StringId.Login,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.MainBackgroundColor,
};
- dialog.AddChidren(btnHeadImage);
+ contentView.AddChidren(btnSkipBindPage);
+
+ btnSkipBindPage.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ this.Close();
+
+ AutoLoginAction?.Invoke(account, password, isPhone);
+
+ };
dialog.Show();
-
- new Thread(() =>
- {
- Thread.Sleep(1500);
- Application.RunOnMainThread(() =>
- {
- dialog.Close();
- this.Close();
- });
- })
- { IsBackground = true }.Start();
}
-
}
}
--
Gitblit v1.8.0