From 427a6e93b8946b9d91727166a352b2ee2ef75d19 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:10:08 +0800
Subject: [PATCH] Delete .DS_Store
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4cb6b6a..08a8c29 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),
@@ -182,22 +185,31 @@
};
bodyView.AddChidren(btnIcon_bg);
+#if DEBUG
+ bool b = false;
btnIcon.MouseUpEventHandler += (sender, e) =>
{
-#if DEBUG
- etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//
+ //return;
+ if (b)
+ {
+ etAccount.Text = "13415629083";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ }
+ else
+ {
+ etAccount.Text = "13226233133";//13375012446//13602944661//
+ }
+ b = !b;
etPassword.Text = "123456";
- //etPassword.Text = "qqqqqq";
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,
@@ -208,9 +220,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,
@@ -460,7 +472,7 @@
};
bodyView.AddChidren(btnLogin);
- LoadEventList();
+ LoadEventList();
account = etAccount.Text.Trim();
#if DEBUG1211
@@ -501,7 +513,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),
@@ -514,9 +526,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()
{
@@ -533,8 +549,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