From 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:07:47 +0800
Subject: [PATCH] Revert "20201127 合并嘉乐代码"
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 205c4f9..720f2ab 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -693,11 +693,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;
@@ -727,15 +727,28 @@
var responsePack = pm.GetHomePager();
if (responsePack == StateCode.SUCCESS)
{
- //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
- {
- result = true;
- }
}
else
{
- IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
+ var tipStr = "Server erorr";
+ switch (responsePack)
+ {
+ case "NoLogin":
+ tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
+ break;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ //鎻愮ず鍘熷洜
+ var tip = new Tip()
+ {
+ Text = tipStr,
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ });
+
}
return result;
}
--
Gitblit v1.8.0