From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index ac7893c..344424f 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),
@@ -188,16 +186,40 @@
             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 = "18824864143";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
+                    etAccount.Text = "15626203746";//娴嬭瘯鏈嶅姟鍣�
+                    //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 = "13375012446";//13375012446
+                    //etAccount.Text = "15217626103";//
+                    //etAccount.Text = "13682244600";//娉㈠摜
+                    //etAccount.Text = "BB01010101@evoyo.com";//鍙瀵硅
+                    //etAccount.Text = "13168123446";
+                    //etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
+                    //etAccount.Text = "13602944661";//kx
+                    etAccount.Text = "551775569@qq.com";//wcf
+                    //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
+                    //etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
                 }
                 b = !b;
                 etPassword.Text = "123456";
@@ -210,7 +232,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,
@@ -221,9 +243,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 +498,7 @@
            LoadEventList();
             account = etAccount.Text.Trim();
 
-#if DEBUG1211
+            #if DEBUG1211
             //鏈湴妯″紡
             Button btnLocalMode = new Button()
             {
@@ -498,7 +520,7 @@
 
             MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
 
-#endif
+            #endif
 
             #region 闅愮鏀跨瓥
             AddServiceAgreementControl(bodyView);
@@ -527,9 +549,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