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 | 314 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 196 insertions(+), 118 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 80afe1c..cc1ccf6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -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" };
@@ -597,11 +668,11 @@
{
sid = "030101123456780604010001ABCD",
name = "绌鸿皟",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
- new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
- new Trait { name = "set_temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new FunctionAttributes { key="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
+ new FunctionAttributes { key = "fan",max = 3,min =0,value = new List<string>{ "low", "medium", "high" ,"auto"} },
+ new FunctionAttributes { key = "set_temperature", max = 32,min=16,value = new List<string>{"up","down" } },
},
roomIdList = new List<string>() { "0001" },
lastState = "鍒跺喎 涓 18掳C",
@@ -616,8 +687,8 @@
{
sid = "030101123456780202020002ABCD",
name = "璋冨厜鐏�",
- function = new List<Trait>() {
- new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
},//"brightness",
roomIdList = new List<string>() { "0001" },
lastState = "20%",
@@ -634,8 +705,8 @@
sid = "030101123456780303010003ABCD",
name = "绐楀笜妯″潡",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
},// "curtain",
lastState = "寮�",
bus_Data = new BusData
@@ -650,8 +721,8 @@
sid = "030101123456780303030011ABCD",
name = "寮�鍚堝笜",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
},//"curtaintype",
lastState = "20%",
bus_Data = new BusData
@@ -666,9 +737,9 @@
sid = "030101123456780503040012ABCD",
name = "鍗峰笜",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
- new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
+ new FunctionAttributes { key="percent", max=100,min = 0, value= new List<string> { "percent" } },
},// "rollingshutter",
lastState = "20%",
@@ -684,10 +755,10 @@
sid = "030101123456780404020004ABCD",
name = "鍦扮儹",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
- new Trait { name = "set_temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new FunctionAttributes { key="mode", max = 2,min =0,value = new List<string>{ "normal", "day", "night","timer","away" } },
+ new FunctionAttributes { key = "set_temperature", max = 32,min=5,value = new List<string>{"up","down" } },
},//
lastState = "鑷姩 25掳C",
bus_Data = new BusData
@@ -701,8 +772,8 @@
{
sid = "030101123456780202010005ABCD",
name = "鍚婄伅",
- function = new List<Trait>() {
- new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},//"on_off",
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
@@ -716,9 +787,9 @@
{
sid = "030101123456780202040006ABCD",
name = "RGB鐏�",
- function = new List<Trait>() {
- new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
+ new FunctionAttributes { key="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
},
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
@@ -732,9 +803,9 @@
{
sid = "030101123456781010020006ABCD",
name = "椋庢墖",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new FunctionAttributes { key="percent", max=7,min = 0, value= new List<string> { "percent" } },
},
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
@@ -748,8 +819,8 @@
{
sid = "030101123456781010020006ABCD",
name = "鐢佃",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
},
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
@@ -763,8 +834,8 @@
{
sid = "030101123456780101020006ABCD",
name = "鎻掑骇",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
},
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
@@ -779,8 +850,8 @@
sid = "030101123456781005060006ABCD",
name = "PM2.5",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "22"} },
},
bus_Data = new BusData
{
@@ -794,8 +865,8 @@
sid = "030101123456781005070006ABCD",
name = "CO2",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "1352"} },
},
bus_Data = new BusData
{
@@ -809,8 +880,8 @@
sid = "030101123456781005020006ABCD",
name = "娓╁害",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "28"} },
},
bus_Data = new BusData
{
@@ -824,8 +895,8 @@
sid = "030101123456781005050006ABCD",
name = "TVOC",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "0.3"} },
},
bus_Data = new BusData
{
@@ -839,8 +910,8 @@
sid = "030101123456781005030006ABCD",
name = "婀垮害",
roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
+ function = new List<FunctionAttributes>() {
+ new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "15"} },
},
bus_Data = new BusData
{
@@ -861,8 +932,8 @@
{
//2020-11-13 寰呯‘璁�
//鑾峰彇浣忓畢澶辫触锛岄噸鏂版爣璁颁负鏈櫥褰曠姸鎬�
- UserInfo.Current.lastTime = DateTime.MinValue;
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.LastTime = DateTime.MinValue;
+ UserInfo.Current.SaveUserInfo();
//鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
}
@@ -920,11 +991,11 @@
// userName = revertData.name
//};
UserInfo.Current.userType = revertData.userType;
- UserInfo.Current.accountString = account;
+ UserInfo.Current.AccountString = account;
//UserInfo.Current.password = password;
- UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.ID = revertData.userId;
- UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
UserInfo.Current.refreshToken = revertData.refreshToken;
UserInfo.Current.userName = revertData.name;
UserInfo.Current.SaveUserInfo();
@@ -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();
@@ -1049,19 +1140,6 @@
forgetPasswordDialog.ShowDialog();
};
- }
-
- /// <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