From d41f1d4a478c1afcc43f3a5abb0ba76e376bc7c1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 09 三月 2021 15:23:25 +0800
Subject: [PATCH] 2

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index ac7893c..1110798 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -165,8 +165,6 @@
         /// </summary>
         public void LoadView(UserInfo userInfo = null)
         {
-            Language.CurrentLanguage = "Chinese";
-
             var btnIcon = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -191,26 +189,29 @@
             bool b = false;
             btnIcon.MouseUpEventHandler += (sender, e) =>
             {
+                //return;
                 if (b)
                 {
-                    etAccount.Text = "18824864143";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
+                    etAccount.Text = "18316672920";//"18316120654";//lcg "18316672920";//hzx;// "13415629083"//cf;//tujie"18316120654";
+                    // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
                 }
                 else
                 {
-                    etAccount.Text = "13375012446";//13375012446
+                    etAccount.Text = "15622703419";//鍑夐湼"18666455392";//13375012446//13602944661//tzy 18778381374
+                    //15971583093 gs
                 }
                 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,
@@ -221,9 +222,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,
@@ -476,7 +477,7 @@
            LoadEventList();
             account = etAccount.Text.Trim();
 
-#if DEBUG1211
+            #if DEBUG1211
             //鏈湴妯″紡
             Button btnLocalMode = new Button()
             {
@@ -498,7 +499,7 @@
 
             MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
 
-#endif
+            #endif
 
             #region 闅愮鏀跨瓥
             AddServiceAgreementControl(bodyView);
@@ -527,9 +528,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