From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy(1.5.9)' into dev--wxr

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 1d703fb..d290c12 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -35,7 +35,7 @@
 
             base.RemoveFromParent();
 
-            ////2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+            //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
             //Application.HideSoftInput();
         }
 
@@ -218,10 +218,10 @@
                     //etAccount.Text = "tf@smarttech.com.ua";
                     //etAccount.Text = "455740454@qq.com";
                     //etAccount.Text = "18688565449";
-                    //etAccount.Text = "support7@hdlautomation.com";
+                    etAccount.Text = "support7@hdlautomation.com";
                     //etAccount.Text = "18570064522";
                     //etAccount.Text = "18718417827";
-                    etAccount.Text = "18188019284";
+                    //etAccount.Text = "18188019284";
                     //etAccount.Text = "13143792049";
                     //etAccount.Text = "13288623489";//缃楁檽涓�
                     //etAccount.Text = "18244942707";
@@ -230,14 +230,16 @@
                     //etAccount.Text = "18244942707";
                     //etAccount.Text = "12345678904";
                     //etAccount.Text = "13418062953";
-                    etAccount.Text = "13138682659";
+                    //etAccount.Text = "13138683659";
+                    //etAccount.Text = "15217626103";
+                    //etAccount.Text = "18100573477";
+                    //etAccount.Text = "18321091245";
+                    etAccount.Text = "13751916353";
                 }
                 else
                 {
-                    //etAccount.Text = "15018447586";//闊充箰鏁伴噺鍒锋柊闂
                     //etAccount.Text = "464027401@qq.com";//
                     //etAccount.Text = "15217626103";//
-                    //etAccount.Text = "13682244600";//娉㈠摜
                     etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
                     //etAccount.Text = "2949126848@qq.com";//闄堢惓
                     etAccount.Text = "15014291819 ";
@@ -277,9 +279,16 @@
                 }else if(etAccount.Text == "18688414428")
                 {
                     etPassword.Text = "HDL1985000";
-                }else if (etAccount.Text == "13138682659")
+                }else if (etAccount.Text == "13138683659")
                 {
                     etPassword.Text = "wsad123321";
+                }
+                else if (etAccount.Text == "18100573477")
+                {
+                    etPassword.Text = "huang12345";
+                }else if(etAccount.Text == "13751916353")
+                {
+                    etPassword.Text = "hdl1985";
                 }
                 //etPassword.Text = "Hdl85521566";
                 btnLogin.IsSelected = true;
@@ -308,7 +317,7 @@
                 Height = Application.GetRealHeight(40),
                 TextID = StringId.LoginByEmail,
                 TextColor = CSS_Color.PromptingColor1,
-                TextAlignment = TextAlignment.Center,
+                TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.TextFontSize,
             };
             bodyView.AddChidren(btnEmailLogin);

--
Gitblit v1.8.0