From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 214 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4691fc3..a60af1c 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -14,6 +14,10 @@
//bodyView = new FrameLayout();
//AddChidren(bodyView);
bodyView = this;
+ //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ bodyView.MouseDownEventHandler += (sender, e) => {
+ Application.HideSoftInput();
+ };
pm = new HttpServerRequest();
}
@@ -25,10 +29,11 @@
waitPage.RemoveFromParent();
waitPage = null;
}
- else
- {
- base.RemoveFromParent();
- }
+
+ base.RemoveFromParent();
+
+ ////2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ //Application.HideSoftInput();
}
#region 灞�閮ㄥ彉閲�
@@ -150,14 +155,16 @@
/// </summary>
string registerPhone;
string registerEmail;
+ /// <summary>
+ /// 鎵嬫満鍖哄彿
+ /// </summary>
+ string phoneZoneCode = "86";
/// <summary>
/// 鍔犺浇瑙嗗浘
/// </summary>
public void LoadView(UserInfo userInfo = null)
{
- Language.CurrentLanguage = "Chinese";
-
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -178,21 +185,43 @@
};
bodyView.AddChidren(btnIcon_bg);
+#if DEBUG
+ btnIcon_bg.MouseUpEventHandler += (sender, e) =>
+ {
+ //ESOnVideo.Current.Test();
+ };
+
+ bool b = false;
btnIcon.MouseUpEventHandler += (sender, e) =>
{
-#if DEBUG
- etAccount.Text = "464027401@qq.com";
- etPassword.Text = "qqqqqq";
+ //ESOnVideo.Current.Test(false);
+
+ //return;
+ if (b)
+ {
+ etAccount.Text = "18316672920";//"18316120654";//lcg "18316672920";//hzx;// "13415629083"//cf;//tujie"18316120654";
+ // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ }
+ else
+ {
+ //etAccount.Text = "BB01010101@evoyo.com";//鍙瀵硅
+ //etAccount.Text = "13168123446";
+ //etAccount.Text = "13602944661";//kx
+ etAccount.Text = "18316120654";//鍑夐湼"18666455392";//13375012446//13602944661//tzy 18778381374
+ //etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
+ }
+ b = !b;
+ etPassword.Text = "123456";
btnLogin.IsSelected = true;
-#endif
};
+ #endif
#region 鐧诲綍鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
{
X = Application.GetRealWidth(28),
Y = Application.GetRealHeight(177),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(40),
TextID = StringId.LoginByPhone,
TextColor = CSS_Color.MainColor,
@@ -203,9 +232,9 @@
btnEmailLogin = new Button()
{
- X = btnPhoneLogin.Right + Application.GetRealWidth(20),
+ X = btnPhoneLogin.Right ,//+ Application.GetRealWidth(20),
Y = Application.GetRealHeight(177),
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(140),
Height = Application.GetRealHeight(40),
TextID = StringId.LoginByEmail,
TextColor = CSS_Color.PromptingColor1,
@@ -230,11 +259,29 @@
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()
{
@@ -426,8 +473,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(403),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Login,
@@ -437,7 +484,7 @@
};
bodyView.AddChidren(btnLogin);
- LoadEventList();
+ LoadEventList();
account = etAccount.Text.Trim();
#if DEBUG1211
@@ -456,7 +503,7 @@
btnLocalMode.MouseUpEventHandler = (sender, e) =>
{
MainPage.LocalMode = true;
- MainPage.LoginUser = new UserInfo();
+ UserInfo.Current = new UserInfo();
MainPage.GoUserPage();
};
@@ -464,6 +511,155 @@
#endif
+ #region 闅愮鏀跨瓥
+ AddServiceAgreementControl(bodyView);
+ #endregion
+
}
+
+ #region 鈻� 鏈嶅姟鍗忚___________________________
+ bool isAgreePrivacyPolicy = false;
+ /// <summary>
+ /// 娣诲姞鏈嶅姟鍗忚鎺т欢
+ /// </summary>
+ /// <param name="frameBack"></param>
+ private void AddServiceAgreementControl(FrameLayout frameLayout)
+ {
+ isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;
+ var frameRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(28),
+ Y = Application.GetRealHeight(628),
+ };
+ frameLayout.AddChidren(frameRow);
+
+ //鍚屾剰鎸夐挳鑳屾櫙
+ var agreeView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(28),
+ Width = Application.GetRealWidth(28),
+ X = Application.GetRealWidth(22),
+ };
+ frameRow.AddChidren(agreeView);
+ if(Language.CurrentLanguage == "Chinese")
+ {
+ agreeView.X = Application.GetRealWidth(82);
+ }
+ //鍚屾剰鍥炬爣鎸夐挳
+ var agreeBtn = new Button()
+ {
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/ChooseIcon.png",
+ SelectedImagePath = "Public/ChooseOnIcon.png",
+ IsSelected = isAgreePrivacyPolicy,
+ Gravity = Gravity.Center
+ };
+ agreeView.AddChidren(agreeBtn);
+
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ isAgreePrivacyPolicy = !isAgreePrivacyPolicy;
+ agreeBtn.IsSelected = isAgreePrivacyPolicy;
+ OnAppConfig.Instance.isAgreePrivacyPolicy = isAgreePrivacyPolicy;
+ OnAppConfig.Instance.SaveConfig();
+ };
+
+ agreeBtn.MouseUpEventHandler = eventHandler;
+ agreeView.MouseUpEventHandler = eventHandler;
+
+ //int btnWidth = 0;
+ //鍚屾剰鏂囨湰
+ var agreeTextBtn = new TextButton()
+ {
+ X = agreeView.Right,
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealHeight(28),
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.Agree
+ };
+ frameRow.AddChidren(agreeTextBtn);
+ agreeTextBtn.Width = Utlis.GetRealWidthByTextButton(agreeTextBtn);
+
+ //鐢ㄦ埛鍗忚鎸夐挳
+ var userAgreementBtn = new TextButton()
+ {
+ X = agreeTextBtn.Right,
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealHeight(28),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "銆�" + Language.StringByID(StringId.UserAgreement) + "銆�"
+ };
+ frameRow.AddChidren(userAgreementBtn);
+ userAgreementBtn.Width = Utlis.GetRealWidthByTextButton(userAgreementBtn);
+
+ //鍜屾枃鏈�
+ var andTextBtn = new TextButton()
+ {
+ X = userAgreementBtn.Right,
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealHeight(28),
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.And
+ };
+ frameRow.AddChidren(andTextBtn);
+ andTextBtn.Width = Utlis.GetRealWidthByTextButton(andTextBtn);
+
+ //闅愮鏀跨瓥鎸夐挳
+ var privacyPolicyBtn = new TextButton()
+ {
+ X = andTextBtn.Right,
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealHeight(28),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = "銆�" + Language.StringByID(StringId.PrivacyPolicy) + "銆�"
+ };
+ frameRow.AddChidren(privacyPolicyBtn);
+ privacyPolicyBtn.Width = Utlis.GetRealWidthByTextButton(privacyPolicyBtn);
+
+ //鎵撳紑鐢ㄦ埛鍗忚
+ userAgreementBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ OpenWebViewPage(false);
+ };
+
+ //鎵撳紑闅愮鏀跨瓥
+ privacyPolicyBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ OpenWebViewPage(true);
+ };
+ }
+
+ /// <summary>
+ /// OpenWebViewPage
+ /// </summary>
+ /// <param name="isOpenPrivacyPolicy">鏄惁闅愮鏀跨瓥</param>
+ private void OpenWebViewPage(bool isOpenPrivacyPolicy)
+ {
+ string url = isOpenPrivacyPolicy ? Constant.URL_PRIVACYPOLICY : Constant.URL_USERAGREEMENT;
+ string titleStr = isOpenPrivacyPolicy ? Language.StringByID(StringId.PrivacyPolicy) : Language.StringByID(StringId.UserAgreement);
+ new WebViewDialog().LoadPage(titleStr, url);
+ }
+
+ /// <summary>
+ /// 妫�娴嬮殣绉佸崗璁�
+ /// </summary>
+ /// <returns></returns>
+ private bool CheckPrivacyPolicy()
+ {
+ if (isAgreePrivacyPolicy == false)
+ {
+ //璇峰悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+ Utlis.ShowTip(Language.StringByID(StringId.PleaseReadAndAgreePrivacyPolicyMsg));
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0