From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 09ccbec..1cc2e76 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,12 +784,12 @@
// 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.refreshToken = revertData.refreshToken;
+ UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.RefreshToken = revertData.refreshToken;
UserInfo.Current.userName = revertData.name;
UserInfo.Current.SaveUserInfo();
--
Gitblit v1.8.0