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/LoginPageBLL.cs | 255 +++++++++++++++++++-------------------------------
1 files changed, 98 insertions(+), 157 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index d91a9b9..eac7338 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -5,7 +5,6 @@
using HDL_ON.UI.CSS;
using Shared;
using HDL_ON.Entity;
-using HDL_ON.DAL.Server;
namespace HDL_ON.UI.UI1Login
{
@@ -65,137 +64,82 @@
btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
return;
}
-
+ btnGetVerificationCode.IsSelected = false ;
+ btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
int time = 60;
new Thread(() =>
{
- //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
- var result = pm.GetRegionByAccount(account);
- if (result.Code != StateCode.SUCCESS)
+ while (time > 0)
{
- IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
- return;
- }
- else
- {
+ time--;
Application.RunOnMainThread(() =>
{
- btnGetVerificationCode.IsSelected = false;
- btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
+ btnGetVerificationCode.Text = time.ToString() + "s";
});
- new Thread(() =>
- {
- while (time > 0)
- {
- time--;
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.Text = time.ToString() + "s";
- });
- Thread.Sleep(1000);
- }
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.IsSelected = true;
- btnGetVerificationCode.TextID = StringId.GetVerificationCode;
- });
- })
- { IsBackground = true }.Start();
-
- //2.1璇锋眰鑾峰彇楠岃瘉鐮�
- var resultObj = pm.VerificationCodeSend(VerifyType.VERIFY_LOGIN, account, true, phoneZoneCode);
- if (resultObj.Code != StateCode.SUCCESS)
- {
- //2.2璇锋眰鑾峰彇楠岃瘉鐮佸け璐�
- Application.RunOnMainThread(() =>
- {
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- });
- // 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
- }
+ Thread.Sleep(1000);
}
-
+ Application.RunOnMainThread(() =>
+ {
+ btnGetVerificationCode.IsSelected = true;
+ btnGetVerificationCode.TextID = StringId.GetVerificationCode;
+ });
})
{ IsBackground = true }.Start();
-
- // btnGetVerificationCode.IsSelected = false ;
- // btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
- // int time = 60;
- // new Thread(() =>
- // {
- // while (time > 0)
- // {
- // time--;
- // Application.RunOnMainThread(() =>
- // {
- // btnGetVerificationCode.Text = time.ToString() + "s";
- // });
- // Thread.Sleep(1000);
- // }
- // Application.RunOnMainThread(() =>
- // {
- // btnGetVerificationCode.IsSelected = true;
- // btnGetVerificationCode.TextID = StringId.GetVerificationCode;
- // });
- // })
- // { IsBackground = true }.Start();
- // new Thread(() =>
- // {
- // //鑾峰彇楠岃瘉鐮�
- // var result = pm.GetLoginVerCode(phoneNumber);
- // if (result.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
- // {
- // }
- // //鐧诲綍澶辫触
- // else
- // {
- // string tipStr = "Sever erorr";
- // switch (result.StateCode.ToUpper())
- // {
- // case "USERNAMEORPWDERROR":
- // tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- // Application.RunOnMainThread(() =>
- // {
- // btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- // btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- // });
- // break;
- // case "ACCOUNTNOEXISTS":
- // tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- // Application.RunOnMainThread(() =>
- // {
- // btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- // btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
- // });
- // break;
- // case "SENDFAIL":
- // tipStr = Language.StringByID(StringId.FailedToSendVerificationCode);
- // Application.RunOnMainThread(() =>
- // {
- // btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- // btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
- // });
- // 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);
- // });
- // }
- // })
- // { IsBackground = true }.Start();
+ new Thread(() =>
+ {
+ //鑾峰彇楠岃瘉鐮�
+ var result = pm.GetLoginVerCode(phoneNumber);
+ if (result.StateCode.ToUpper() == "SUCCESS")
+ {
+ }
+ //鐧诲綍澶辫触
+ else
+ {
+ string tipStr = "Sever erorr";
+ switch (result.StateCode.ToUpper())
+ {
+ case "USERNAMEORPWDERROR":
+ tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
+ Application.RunOnMainThread(() =>
+ {
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ break;
+ case "ACCOUNTNOEXISTS":
+ tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
+ Application.RunOnMainThread(() =>
+ {
+ btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ break;
+ case "SENDFAIL":
+ tipStr = Language.StringByID(StringId.FailedToSendVerificationCode);
+ Application.RunOnMainThread(() =>
+ {
+ btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ 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);
+ });
+ }
+ })
+ { IsBackground = true }.Start();
}
};
}
@@ -577,18 +521,6 @@
{
try
{
- //濡傛灉鏄处鍙峰瘑鐮佺櫥褰曪紝鍏堟鏌ヤ竴娆¤处鍙锋槸鍚︽敞鍐岃繃
- if (logintMode == 0)
- {
- //1.鍏堟鏌ヨ处鍙锋槸鍚︽敞鍐岃繃
- var result = pm.GetRegionByAccount(account);
- if (result.Code != StateCode.SUCCESS)
- {
- IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
- return;
- }
- }
-
//鐧诲綍
var loginResult = LoadMethod_Login();
if( !string.IsNullOrEmpty (verAccount))//楠岃瘉鐧诲綍璐﹀彿
@@ -898,11 +830,6 @@
MainPage.GoUserPage();
});
}
- else
- {
- //2020-11-13 寰呯‘璁�
- MainPage.ShowAlertOnMainThread("鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹呫��");
- }
}
}
catch (Exception ex)
@@ -931,7 +858,7 @@
bool LoadMethod_Login()
{
var result = false;
- ResponsePackNew loginResult;
+ ResponsePack loginResult;
if (logintMode == 0 || loginType == 1)
{
//璋冪敤鐧诲綍鎺ュ彛
@@ -942,19 +869,21 @@
//璋冪敤楠岃瘉鐮佺櫥褰曟帴鍙�
loginResult = pm.LoginValidCode(account, password);
}
- if (loginResult.Code == StateCode.SUCCESS)
+ if (loginResult.StateCode.ToUpper() == "SUCCESS")
{
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
+ var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
+
+ //璁板綍鐢ㄦ埛鏁版嵁
MainPage.LoginUser = new UserInfo
{
- userType = revertData.userType,
+ ID = (int)loginDataStr.GetValue("UserID"),
+ masterID = (int)loginDataStr.GetValue("MainUserID"),
+ accountType = (int)loginDataStr.GetValue("UserType"),
+ loginTokenString = loginDataStr.GetValue("Token").ToString(),
accountString = account,
password = password,
lastTime = DateTime.Now,
- ID = revertData.userId,
- loginTokenString = revertData.headerPrefix + revertData.accessToken,
- refreshToken = revertData.refreshToken,
- userName = revertData.name
+ userName = loginDataStr.GetValue("Remark").ToString(),
};
MainPage.LoginUser.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
@@ -969,9 +898,8 @@
//鐧诲綍澶辫触
else
{
- //2020-11-13 寰呬慨鏀�
string tipStr = "Sever erorr";
- switch (loginResult.Code)
+ switch (loginResult.StateCode)
{
case "ValidCodeAndPhoneNoEqual":
tipStr = Language.StringByID(StringId.VerificationCodeError);
@@ -1028,18 +956,31 @@
{
var result = false;
var responsePack = pm.GetHomePager();
- if (responsePack == StateCode.SUCCESS)
+
+ if (responsePack == "Success")
{
- //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if (MainPage.LoginUser.regionList != null && MainPage.LoginUser.regionList.Count > 0){
- result = true;
- }
- //result = true;
+ result = true;
}
else
{
- // 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Gethomepager, 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