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/LoginPageBLL.cs | 228 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 153 insertions(+), 75 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 85229b6..cc1ccf6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
using System.Text.RegularExpressions;
using System.Threading;
using System.Collections.Generic;
@@ -93,13 +93,36 @@
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);
@@ -114,38 +137,87 @@
// 鎻愮ず閿欒
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();
}
};
}
@@ -247,8 +319,8 @@
//if (btnGetVerificationCode.Parent != null)
//{
- //btnGetVerificationCode.RemoveFromParent();
- btnGetVerificationCode.Visible = false;
+ //btnGetVerificationCode.RemoveFromParent();
+ btnGetVerificationCode.Visible = false;
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
@@ -279,8 +351,8 @@
btnPasswordIcon.IsSelected = false;
//if (btnGetVerificationCode.Parent != null)
//{
- //btnGetVerificationCode.RemoveFromParent();
- btnGetVerificationCode.Visible = false;
+ //btnGetVerificationCode.RemoveFromParent();
+ btnGetVerificationCode.Visible = false;
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
@@ -496,7 +568,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;
@@ -538,7 +610,6 @@
if (result.Code != StateCode.SUCCESS)
{
IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
- ShowBtnAccountViewBottomLineError();
return;
}
else
@@ -550,7 +621,7 @@
//鐧诲綍
var loginResult = LoadMethod_Login();
- if (!string.IsNullOrEmpty(verAccount))//楠岃瘉鐧诲綍璐﹀彿
+ if( !string.IsNullOrEmpty (verAccount))//楠岃瘉鐧诲綍璐﹀彿
{
Application.RunOnMainThread(() =>
{
@@ -586,7 +657,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" };
@@ -940,30 +1011,54 @@
//鐧诲綍澶辫触
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(() =>
{
- if (loginResult.Code == "10008")
- {
- //鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒
- 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();
+ //鎻愮ず鍘熷洜
+ var tip = new Tip()
+ {
+ Text = tipStr,
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
});
-
- IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
}
return result;
}
@@ -978,8 +1073,7 @@
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;
@@ -1014,9 +1108,6 @@
// });
//};
- //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
- if (CheckPrivacyPolicy() == false) return;
-
var registerPage = new RegisterPage();
registerPage.Show();
registerPage.ShowDialog();
@@ -1050,18 +1141,5 @@
};
}
-
- /// <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