From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 212 ++++++++++++++++-------------------------------------
1 files changed, 64 insertions(+), 148 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 1cc2e76..4f30528 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -27,36 +27,6 @@
/// 閫夋嫨閭鐧诲綍鎸夐挳
/// </summary>
Button btnEmailLogin;
- #region 鏈嶅姟鍣ㄩ�夋嫨
- /// <summary>
- /// 鏈嶅姟鍣ㄥ尯鍩�
- /// </summary>
- FrameLayout serverView;
- /// <summary>
- /// 鏈嶅姟鍣↖con鎸夐挳
- /// </summary>
- Button btnServerIcon;
- /// <summary>
- /// 鏈嶅姟鍣ㄦ枃鏈
- /// </summary>
- Button btnServerText;
- ///// <summary>
- ///// 鏈嶅姟鍣ㄦ枃鏈
- ///// </summary>
- //EditText etServer;
- ///// <summary>
- ///// 鏈嶅姟鍣ㄥ瓙鍖哄煙閲岄潰鐨勫垎鍓茬嚎1
- ///// </summary>
- //Button btnLineVertical_server;
- /// <summary>
- ///鏈嶅姟鍣╣o鎸夐挳
- /// </summary>
- Button btnServerGo;
- /// <summary>
- /// 鏈嶅姟鍣ㄥ瓙鍖哄煙搴曢儴妯嚎
- /// </summary>
- Button btnServerBottomLine;
- #endregion
/// <summary>
/// 璐﹀彿瀛愬尯鍩�
/// </summary>
@@ -194,14 +164,6 @@
/// 1:閭
/// </summary>
int registerType;
- /// <summary>
- /// 鎵嬫満鍖哄彿
- /// </summary>
- string phoneZoneCode = "86";
- /// <summary>
- /// 鏄惁閫夋嫨杩囨湇鍔″櫒
- /// </summary>
- bool isSelectServer;
string registerPhone;
string registerEmail;
@@ -261,66 +223,11 @@
bodyView.AddChidren(btnEmailLogin);
#endregion
- #region 鏈嶅姟鍣ㄩ�夋嫨
- serverView = new FrameLayout()
- {
- X = Application.GetRealWidth(28),
- Y = Application.GetRealHeight(167),
- Width = Application.GetRealWidth(319),
- Height = Application.GetRealHeight(44),
- };
- bodyView.AddChidren(serverView);
-
- btnServerIcon = new Button()
- {
- X = Application.GetRealWidth(9),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(20),
- Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = "LoginIcon/Server.png",
-
- };
- serverView.AddChidren(btnServerIcon);
-
- btnServerText = new Button()
- {
- X = Application.GetRealWidth(49),
- Width = Application.GetRealWidth(319 - 78),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.PleaseSelectCountryOrRegion,
- };
- serverView.AddChidren(btnServerText);
-
- #region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
- btnServerGo = new Button()
- {
- X = Application.GetRealWidth(303),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- serverView.AddChidren(btnServerGo);
-
- #endregion
- btnServerBottomLine = new Button()
- {
- Y = Application.GetRealHeight(42),
- BackgroundColor = CSS_Color.DividingLineColor,
- SelectedBackgroundColor = CSS_Color.MainColor,
- Height = Application.GetRealHeight(1),
- };
- serverView.AddChidren(btnServerBottomLine);
- #endregion
-
- int topPadding = Application.GetRealHeight(12);
#region 璐﹀彿濉啓
accountView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = serverView.Bottom + topPadding,
+ Y = Application.GetRealHeight(167),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -332,22 +239,9 @@
X = Application.GetRealWidth(9),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "+" + phoneZoneCode,
+ Text = "+86",
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);
@@ -372,7 +266,6 @@
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
- IsNumberKeyboardType = true
};
accountView.AddChidren(etAccount);
@@ -402,7 +295,7 @@
passwordView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = accountView.Bottom + topPadding,
+ Y = Application.GetRealHeight(223),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -468,7 +361,7 @@
repeatPasswordView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = passwordView.Bottom + topPadding,
+ Y = Application.GetRealHeight(279),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -536,8 +429,7 @@
verificationCodeView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = repeatPasswordView.Bottom + topPadding,
- //Y = Application.GetRealHeight(335),
+ Y = Application.GetRealHeight(335),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -614,11 +506,10 @@
btnRegister = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = verificationCodeView.Bottom + Application.GetRealHeight(42),
- //Y = Application.GetRealHeight(421),
+ Y = Application.GetRealHeight(421),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Register,
@@ -769,39 +660,51 @@
var result = false;
//璋冪敤鐧诲綍鎺ュ彛
var loginResult = pm.LoginByPassword(account, password);
- if (loginResult.Code == StateCode.SUCCESS)
+ if (loginResult.StateCode.ToUpper() == "SUCCESS")
{
- 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;
+ var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
- UserInfo.Current.SaveUserInfo();
+ //璁板綍鐢ㄦ埛鏁版嵁
+ 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();
MainPage.Log("鐧诲綍鎴愬姛銆�");
result = true;
+
+
}
+ //鐧诲綍澶辫触
else
{
- //鐧诲綍澶辫触
- IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
+ 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;
+ }
+ //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
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);
});
@@ -816,17 +719,30 @@
{
var result = false;
var responsePack = pm.GetHomePager();
- if (responsePack == StateCode.SUCCESS)
+ if (responsePack == "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