From 79fe8dab1bcb8e8d92d9058ca2540cd4e8f9ecf9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:05:32 +0800
Subject: [PATCH] 20201127 合并嘉乐代码
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 228 ++++++++++++++++++--------------------------------------
1 files changed, 75 insertions(+), 153 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index cc1ccf6..85229b6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.Text.RegularExpressions;
using System.Threading;
using System.Collections.Generic;
@@ -93,36 +93,13 @@
if (result.Code != StateCode.SUCCESS)
{
IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ ShowBtnAccountViewBottomLineError();
return;
}
else
{
//妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
CheckAndSetUserRequestHost(result);
- //
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.IsSelected = false;
- btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
- });
- 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);
@@ -137,87 +114,38 @@
// 鎻愮ず閿欒
IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnGetVerificationCode.IsSelected = false;
+ btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
+ });
+
+ 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();
+ }
}
})
{ 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();
}
};
}
@@ -319,8 +247,8 @@
//if (btnGetVerificationCode.Parent != null)
//{
- //btnGetVerificationCode.RemoveFromParent();
- btnGetVerificationCode.Visible = false;
+ //btnGetVerificationCode.RemoveFromParent();
+ btnGetVerificationCode.Visible = false;
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
@@ -351,8 +279,8 @@
btnPasswordIcon.IsSelected = false;
//if (btnGetVerificationCode.Parent != null)
//{
- //btnGetVerificationCode.RemoveFromParent();
- btnGetVerificationCode.Visible = false;
+ //btnGetVerificationCode.RemoveFromParent();
+ btnGetVerificationCode.Visible = false;
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
@@ -568,7 +496,7 @@
{
btnLogin.IsSelected = false;
}
- if (Regex.IsMatch(account, @"^[1]+\d{10}") )//&& account.Length == 11)
+ if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
{
btnGetVerificationCode.IsSelected = true;
btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
@@ -610,6 +538,7 @@
if (result.Code != StateCode.SUCCESS)
{
IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ ShowBtnAccountViewBottomLineError();
return;
}
else
@@ -621,7 +550,7 @@
//鐧诲綍
var loginResult = LoadMethod_Login();
- if( !string.IsNullOrEmpty (verAccount))//楠岃瘉鐧诲綍璐﹀彿
+ if (!string.IsNullOrEmpty(verAccount))//楠岃瘉鐧诲綍璐﹀彿
{
Application.RunOnMainThread(() =>
{
@@ -657,7 +586,7 @@
OnAppConfig.Instance.RefreshUserConfig();
DB_ResidenceData.InitRoomFunction();
}
- if ( UserInfo.Current.userEmailInfo == "464027401@qq.com")
+ if (UserInfo.Current.userEmailInfo == "464027401@qq.com")
{
DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" });
var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };
@@ -1011,54 +940,30 @@
//鐧诲綍澶辫触
else
{
- //2020-11-13 寰呬慨鏀�
- string tipStr = "Sever erorr";
- switch (loginResult.Code)
- {
- case "ValidCodeAndPhoneNoEqual":
- tipStr = Language.StringByID(StringId.VerificationCodeError);
- Application.RunOnMainThread(() =>
- {
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- });
- break;
- 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 "NoRecord":
- tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- case "Self:Net_Error":
- tipStr = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
//璐﹀彿鎴栬�呭瘑鐮侀敊璇�
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
- //鎻愮ず鍘熷洜
- var tip = new Tip()
+ if (loginResult.Code == "10008")
{
- Text = tipStr,
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
+ //鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ }
+ else if (loginResult.Code == "10010")
+ {
+ //鐢ㄦ埛涓嶅瓨鍦�
+ btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ }
+ else if (loginResult.Code == "14")
+ {
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ }
+ waitPage.Hide();
});
+
+ IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
}
return result;
}
@@ -1073,7 +978,8 @@
if (responsePack == StateCode.SUCCESS)
{
//2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if ( UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0){
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
result = true;
}
//result = true;
@@ -1108,6 +1014,9 @@
// });
//};
+ //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
+ if (CheckPrivacyPolicy() == false) return;
+
var registerPage = new RegisterPage();
registerPage.Show();
registerPage.ShowDialog();
@@ -1141,5 +1050,18 @@
};
}
+
+ /// <summary>
+ /// 鐢ㄦ埛涓嶅瓨鍦�
+ /// </summary>
+ void ShowBtnAccountViewBottomLineError()
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //鐢ㄦ埛涓嶅瓨鍦�
+ btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ }
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0