From a5ba89efa83d0a4afd0d25dbeba5989e4944b5b8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 24 十一月 2020 18:57:56 +0800
Subject: [PATCH] 20201124;mqtt代码整理备份
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 4f30528..720f2ab 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -164,6 +164,10 @@
/// 1:閭
/// </summary>
int registerType;
+ /// <summary>
+ /// 鎵嬫満鍖哄彿
+ /// </summary>
+ string phoneZoneCode = "86";
string registerPhone;
string registerEmail;
@@ -239,9 +243,22 @@
X = Application.GetRealWidth(9),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "+86",
+ Text = "+" + phoneZoneCode,
TextSize = CSS_FontSize.TextFontSize,
};
+
+ //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+ EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+ JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+ if (!string.IsNullOrEmpty(code))
+ {
+ phoneZoneCode = code;
+ btnGlobalRoaming.Text = "+" + phoneZoneCode;
+ }
+ });
+ };
+ btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
if (accountType == 0)
{
accountView.AddChidren(btnGlobalRoaming);
@@ -266,6 +283,7 @@
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+ IsNumberKeyboardType = true
};
accountView.AddChidren(etAccount);
@@ -660,51 +678,39 @@
var result = false;
//璋冪敤鐧诲綍鎺ュ彛
var loginResult = pm.LoginByPassword(account, password);
- if (loginResult.StateCode.ToUpper() == "SUCCESS")
+ if (loginResult.Code == StateCode.SUCCESS)
{
- var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
+ var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
+ // 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;
- //璁板綍鐢ㄦ埛鏁版嵁
- MainPage.LoginUser = new UserInfo
- {
- ID = (int)loginDataStr.GetValue("UserID"),
- masterID = (int)loginDataStr.GetValue("MainUserID"),
- accountType = (int)loginDataStr.GetValue("UserType"),
- accountString = account,
- password = password,
- lastTime = DateTime.Now,
- userName = loginDataStr.GetValue("Remark").ToString(),
- };
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
result = true;
-
-
}
- //鐧诲綍澶辫触
else
{
- string tipStr = "Sever erorr";
- switch (loginResult.StateCode)
- {
- case "USERNAMEORPWDERROR":
- tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- break;
- case "Self:Net_Error":
- tipStr = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
- //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
+ //鐧诲綍澶辫触
+ IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
Application.RunOnMainThread(() =>
{
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
});
@@ -719,7 +725,7 @@
{
var result = false;
var responsePack = pm.GetHomePager();
- if (responsePack == "Success")
+ if (responsePack == StateCode.SUCCESS)
{
}
else
--
Gitblit v1.8.0