From cc48110a814477bc0d01615f9844aea6ff2b609f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 28 四月 2021 14:51:38 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr4
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5e95f8b..4b59f5a 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 灞�閮ㄥ彉閲�
@@ -160,8 +165,6 @@
/// </summary>
public void LoadView(UserInfo userInfo = null)
{
- Language.CurrentLanguage = "Chinese";
-
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -183,16 +186,38 @@
bodyView.AddChidren(btnIcon_bg);
#if DEBUG
+ btnIcon_bg.MouseUpEventHandler += (sender, e) =>
+ {
+ //ESOnVideo.Current.Test();
+ };
+
bool b = false;
btnIcon.MouseUpEventHandler += (sender, e) =>
{
+ //ESOnVideo.Current.Test(false);
+
+ //return;
if (b)
{
- etAccount.Text = "13375012446";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ //etAccount.Text = "13375012446";
+ //etAccount.Text = "1033326940@qq.com";
+ //etAccount.Text = "18022428438";//wjc
+ //etAccount.Text = "13602944661";//kx
+ //etAccount.Text = "13226233133";//璞嗚眴
+ //etAccount.Text = "18316672920";//lcg "18316672920";//hzx;// "13415629083"//cf;;
+ etAccount.Text = "18316120654";//tujie
+ // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
}
else
{
- etAccount.Text = "13697499568";
+ //etAccount.Text = "15217626103";//
+ //etAccount.Text = "13682244600";//娉㈠摜
+ //etAccount.Text = "BB01010101@evoyo.com";//鍙瀵硅
+ //etAccount.Text = "13168123446";
+ //etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
+ etAccount.Text = "13602944661";//kx
+ //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
+ //etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
}
b = !b;
etPassword.Text = "123456";
@@ -205,7 +230,7 @@
{
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,
@@ -216,9 +241,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,
@@ -468,10 +493,10 @@
};
bodyView.AddChidren(btnLogin);
- LoadEventList();
+ LoadEventList();
account = etAccount.Text.Trim();
-#if DEBUG1211
+ #if DEBUG1211
//鏈湴妯″紡
Button btnLocalMode = new Button()
{
@@ -493,7 +518,7 @@
MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
-#endif
+ #endif
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
@@ -509,7 +534,7 @@
/// <param name="frameBack"></param>
private void AddServiceAgreementControl(FrameLayout frameLayout)
{
- isAgreePrivacyPolicy = UserInfo.Current.isAgreePrivacyPolicy;
+ isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;
var frameRow = new FrameLayout()
{
Height = Application.GetRealHeight(28),
@@ -522,9 +547,13 @@
{
Height = Application.GetRealHeight(28),
Width = Application.GetRealWidth(28),
- X = Application.GetRealWidth(82),
+ X = Application.GetRealWidth(22),
};
frameRow.AddChidren(agreeView);
+ if(Language.CurrentLanguage == "Chinese")
+ {
+ agreeView.X = Application.GetRealWidth(82);
+ }
//鍚屾剰鍥炬爣鎸夐挳
var agreeBtn = new Button()
{
@@ -541,8 +570,8 @@
{
isAgreePrivacyPolicy = !isAgreePrivacyPolicy;
agreeBtn.IsSelected = isAgreePrivacyPolicy;
- UserInfo.Current.isAgreePrivacyPolicy = isAgreePrivacyPolicy;
- UserInfo.Current.SaveUserInfo();
+ OnAppConfig.Instance.isAgreePrivacyPolicy = isAgreePrivacyPolicy;
+ OnAppConfig.Instance.SaveConfig();
};
agreeBtn.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0