From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 137 ++++++++++++++++++++++++++++++---------------
1 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 8766b65..90e8660 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -60,6 +60,7 @@
{
var tip = new Tip()
{
+ MaxWidth = Application.GetRealWidth(300),
Text = Language.StringByID(StringId.PlsEntryPhoneNumber),
CloseTime = 1,
Direction = AMPopTipDirection.None
@@ -74,6 +75,7 @@
{
var tip = new Tip()
{
+ MaxWidth = Application.GetRealWidth(300),
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
CloseTime = 1,
Direction = AMPopTipDirection.None
@@ -84,6 +86,9 @@
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
return;
}
+#if __IOS__
+ etPassword.Foucs = true;
+#endif
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
bodyView.AddChidren(waitPage);
@@ -225,6 +230,9 @@
}
//楠岃瘉鐮佷笉闇�瑕侀殣钘�
etPassword.SecureTextEntry = false;
+#if __IOS__
+ etPassword.SetTextContentTypeToOneTimeCode();
+#endif
}
#endregion
}
@@ -313,6 +321,7 @@
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
+ //etPassword.IsNumberKeyboardType = false;
}
//楠岃瘉鐮佺櫥褰�
else if (logintMode == 1)
@@ -340,6 +349,9 @@
}
//楠岃瘉鐮佷笉闇�瑕侀殣钘�
etPassword.SecureTextEntry = false;
+ etPassword.Text = smsCode;
+ //etPassword.IsNumberKeyboardType = true;
+
}
}
@@ -390,6 +402,7 @@
{
var tip = new Tip()
{
+ MaxWidth = Application.GetRealWidth(300),
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
CloseTime = 1,
Direction = AMPopTipDirection.None
@@ -413,6 +426,7 @@
{
var tip = new Tip()
{
+ MaxWidth = Application.GetRealWidth(300),
Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
CloseTime = 1,
Direction = AMPopTipDirection.None
@@ -431,9 +445,27 @@
{
btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+
+#if __IOS__
+ new Thread(() => {
+ for(var i = 0; i < 10; i++)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ this.Y = 0-Application.GetRealHeight(10 * i);
+ });
+ Thread.Sleep(10);
+ }
+ }) { IsBackground = true }.Start();
+
+ var sst = etPassword.MyTextContentType;
+ Console.WriteLine(sst);
+ etPassword.SetTextContentTypeToOneTimeCode();
+#endif
}
else
{
+ this.Y = 0;
btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
}
@@ -448,12 +480,8 @@
etPassword.EditorEnterAction += (obj) =>
{
Application.HideSoftInput();
+ LoginEvent();
};
- etPassword.MouseUpEventHandler = (sender, e) =>
- {
- etPassword.Foucs = true;
- };
-
}
/// <summary>
@@ -482,48 +510,7 @@
{
btnLogin.MouseUpEventHandler += (sender, e) =>
{
- if (btnLogin.IsSelected)
- {
- //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
- if (CheckPrivacyPolicy() == false) return;
-
- account = etAccount.Text.Trim();
- password = etPassword.Text.Trim();
-
- if (loginType == 0)
- {
- if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
- {
- var tip = new Tip()
- {
- Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- return;
- }
- }
- else
- {
- if (!Utlis.CheckEmail(account))
- {
- var tip = new Tip()
- {
- Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- return;
- }
- }
-
- //鍒涘缓鐧诲綍绾跨▼
- var loginThread = LoadThread_Login();
- waitPage = new Loading();
- new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
- }
+ LoginEvent();
};
#region 褰撹处鍙峰瘑鐮侀兘杈撳叆鏃讹紝鎵嶈兘鐐瑰嚮鐧诲綍鎸夐挳
etAccount.TextChangeEventHandler = (sender, e) =>
@@ -561,7 +548,58 @@
};
#endregion
}
+ /// <summary>
+ /// 鐧诲綍浜嬩欢
+ /// </summary>
+ void LoginEvent()
+ {
+ if (btnLogin.IsSelected)
+ {
+ //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
+ if (CheckPrivacyPolicy() == false)
+ {
+ Application.HideSoftInput();
+ return;
+ }
+ account = etAccount.Text.Trim();
+ password = etPassword.Text.Trim();
+ if (loginType == 0)
+ {
+ if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ return;
+ }
+ }
+ else
+ {
+ if (!Utlis.CheckEmail(account))
+ {
+ var tip = new Tip()
+ {
+ Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ return;
+ }
+ }
+
+ //鍒涘缓鐧诲綍绾跨▼
+ var loginThread = LoadThread_Login();
+ waitPage = new Loading();
+ new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
+ }
+ }
/// <summary>
/// 鍔犺浇鐧诲綍绾跨▼
/// </summary>
@@ -692,6 +730,11 @@
//璋冪敤楠岃瘉鐮佺櫥褰曟帴鍙�
loginResult = pm.LoginValidCode(account, password);
}
+ if(loginResult == null)
+ {
+
+ return false;
+ }
if (loginResult.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
--
Gitblit v1.8.0