From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
old mode 100755
new mode 100644
index 182ca6a..08a8c29
--- 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),
@@ -186,13 +189,14 @@
             bool b = false;
             btnIcon.MouseUpEventHandler += (sender, e) =>
             {
+                //return;
                 if (b)
                 {
-                    etAccount.Text = "13375012446";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
+                    etAccount.Text = "13415629083";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
                 }
                 else
                 {
-                    etAccount.Text = "18824864143";//13375012446
+                    etAccount.Text = "13226233133";//13375012446//13602944661//
                 }
                 b = !b;
                 etPassword.Text = "123456";
@@ -205,7 +209,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 +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,
@@ -468,7 +472,7 @@
             };
             bodyView.AddChidren(btnLogin);
 
-            LoadEventList();
+           LoadEventList();
             account = etAccount.Text.Trim();
 
 #if DEBUG1211
@@ -522,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()
             {

--
Gitblit v1.8.0