From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 09ccbec..f69f6d2 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -287,14 +287,9 @@
X = Application.GetRealWidth(49),
Width = Application.GetRealWidth(319 - 78),
TextAlignment = TextAlignment.CenterLeft,
- //TextColor = CSS_Color.FirstLevelTitleColor,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- //Text = "璇烽�夋嫨鍥藉/鍖哄煙",
TextID = StringId.PleaseSelectCountryOrRegion,
- //PlaceholderTextColor = CSS_Color.PromptingColor1,
- //PlaceholderText = Language.StringByID(StringId.PlsRegisterPassword),
- //SecureTextEntry = true,
};
serverView.AddChidren(btnServerText);
@@ -622,8 +617,8 @@
Y = verificationCodeView.Bottom + Application.GetRealHeight(42),
//Y = Application.GetRealHeight(421),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Register,
@@ -789,11 +784,11 @@
// userName = revertData.name
//};
UserInfo.Current.userType = revertData.userType;
- UserInfo.Current.accountString = account;
+ UserInfo.Current.AccountString = account;
//UserInfo.Current.password = password;
- UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.ID = revertData.userId;
- UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
UserInfo.Current.refreshToken = revertData.refreshToken;
UserInfo.Current.userName = revertData.name;
--
Gitblit v1.8.0