From 37c33341f75841dc39c535eb62a3603f596516a1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 27 二月 2020 17:11:53 +0800
Subject: [PATCH] 20200227

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

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index e24e26d..4b02192 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -145,7 +145,7 @@
         /// <summary>
         /// 鍔犺浇瑙嗗浘
         /// </summary>
-        public void LoadView()
+        public void LoadView(string account = "")
         {
             var btnIcon = new Button()
             {
@@ -157,7 +157,8 @@
             };
             bodyView.AddChidren(btnIcon);
 
-            var btnIcon_bg = new Button() {
+            var btnIcon_bg = new Button()
+            {
                 X = Application.GetRealWidth(171),
                 Y = Application.GetRealHeight(69),
                 Width = Application.GetMinRealAverage(254),
@@ -169,11 +170,9 @@
             btnIcon.MouseUpEventHandler += (sender, e) =>
             {
 #if DEBUG
-                UserConfig.Instance.SkinCode = UserConfig.Instance.SkinCode > 1 ? 0 : 1;
-                SharedMethod.SharedMethod.ChangeSkin();
-                MainPage.Log($"UserConfig.skincode{UserConfig.Instance.SkinCode}");
                 etAccount.Text = "464027401@qq.com";
                 etPassword.Text = "qqqqqq";
+                btnLogin.IsSelected = true;
 #endif
             };
 
@@ -184,7 +183,7 @@
                 Y = Application.GetRealHeight(177),
                 Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(40),
-                TextID = R.InternationalizationString.LoginByPhone,
+                TextID = StringId.LoginByPhone,
                 TextColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
@@ -197,7 +196,7 @@
                 Y = Application.GetRealHeight(177),
                 Width = Application.GetRealWidth(100),
                 Height = Application.GetRealHeight(40),
-                TextID = R.InternationalizationString.LoginByEmail,
+                TextID = StringId.LoginByEmail,
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.TextFontSize,
@@ -244,10 +243,14 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryAccount),
+                PlaceholderText = Language.StringByID(StringId.PlsEntryAccount),
             };
             accountView.AddChidren(etAccount);
 
+            if (account != "")
+            {
+                etAccount.Text = account;
+            }
 
             btnAccountViewBottomLine = new Button()
             {
@@ -312,7 +315,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryPassword),
+                PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
                 SecureTextEntry = true,
             };
             passwordView.AddChidren(etPassword);
@@ -345,7 +348,7 @@
                 Width = Application.GetRealWidth(56),
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextID = R.InternationalizationString.ForgetPassword,
+                TextID = StringId.ForgetPassword,
                 TextSize = 12,
             };
             passwordView.AddChidren(btnForgetPassword);
@@ -356,7 +359,7 @@
             {
                 X = Application.GetRealWidth(219),
                 Width = Application.GetRealWidth(100),
-                TextID = R.InternationalizationString.GetVerificationCode,
+                TextID = StringId.GetVerificationCode,
                 TextColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.CenterRight,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -384,7 +387,7 @@
                 Height = Application.GetRealHeight(17 + 12 + 12),
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextID = R.InternationalizationString.SingUp,
+                TextID = StringId.SingUp,
                 TextAlignment = TextAlignment.CenterLeft,
             };
             bodyView.AddChidren(btnRegister);
@@ -397,7 +400,7 @@
                 Height = Application.GetRealHeight(51),
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextID = R.InternationalizationString.VerificationCodeLogin,
+                TextID = StringId.VerificationCodeLogin,
                 TextAlignment = TextAlignment.CenterRight,
             };
             bodyView.AddChidren(btnSwitchLoginMode);
@@ -413,7 +416,7 @@
                 Radius = (uint)Application.GetRealHeight(22),
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 BackgroundColor = CSS_Color.PromptingColor1,
-                TextID = R.InternationalizationString.Login,
+                TextID = StringId.Login,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextAlignment = TextAlignment.Center,

--
Gitblit v1.8.0