From 8c1bf42c5fca66625b59728006bd47bae0b6a3ad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:18:16 +0800
Subject: [PATCH] Revert "Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL"
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index da291bd..25dd3d1 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -283,6 +283,7 @@
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+ IsNumberKeyboardType = true
};
accountView.AddChidren(etAccount);
@@ -680,25 +681,34 @@
if (loginResult.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
- MainPage.LoginUser = new UserInfo
- {
- userType = revertData.userType,
- accountString = account,
- password = password,
- lastTime = DateTime.Now,
- ID = revertData.userId,
- loginTokenString = revertData.headerPrefix + revertData.accessToken,
- refreshToken = revertData.refreshToken,
- userName = revertData.name
- };
- MainPage.LoginUser.SaveUserInfo();
+ // UserInfo.Current = new UserInfo
+ //{
+ // userType = revertData.userType,
+ // accountString = account,
+ // password = password,
+ // lastTime = DateTime.Now,
+ // ID = revertData.userId,
+ // loginTokenString = revertData.headerPrefix + revertData.accessToken,
+ // refreshToken = revertData.refreshToken,
+ // userName = revertData.name
+ //};
+ UserInfo.Current.userType = revertData.userType;
+ UserInfo.Current.accountString = account;
+ //UserInfo.Current.password = password;
+ UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.ID = revertData.userId;
+ UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.refreshToken = revertData.refreshToken;
+ UserInfo.Current.userName = revertData.name;
+
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
result = true;
}
else
{
//鐧诲綍澶辫触
- IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Login, loginResult.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
Application.RunOnMainThread(() =>
{
btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
--
Gitblit v1.8.0