From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index f10e1fc..ea8bce7 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -59,7 +59,7 @@
btnLogoIcon.Gravity = Gravity.CenterHorizontal;
this.AddChidren(btnLogoIcon);
//Evoyo Home
- var btnLogoName = new NormalViewControl(300, 69, true);
+ var btnLogoName = new NormalViewControl(700, 69, true);
btnLogoName.Y = btnLogoIcon.Bottom;
btnLogoName.Gravity = Gravity.CenterHorizontal;
btnLogoName.TextID = R.MyInternationalizationString.AppName;
@@ -684,7 +684,8 @@
btnMsg2.ButtonClickEvent += (sender, e) =>
{
var form = new UserCenter.Abount.SLAForm();
- this.AddChidren(form);
+ CommonPage.Instance.AddChidren(form);
+
form.InitTopFrameLayout();
form.InitBodyFrameLayout();
form.ShowForm();
@@ -778,8 +779,6 @@
var pra = new SendDataToServer.LoginObj();
pra.Account = i_account;
pra.Password = i_psw;
- pra.Source = CommonPage.Source;
- pra.Company = CommonPage.Company;
//璁块棶鎺ュ彛
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
@@ -1111,6 +1110,7 @@
CommonPage.Instance.FailureToServer();
CommonPage.Loading.Hide();
});
+ HdlLogLogic.Current.WriteLog(-1, "鐧婚檰鏃�,娌＄綉缁�");
return;
}
var stateCodeStr = revertObj.StateCode.ToUpper();
@@ -1191,6 +1191,11 @@
//璇峰厛鑾峰彇楠岃瘉鐮�
btnErrorMsg.TextID = R.MyInternationalizationString.NORECORD;
}
+ else if (stateCodeStr == "BERESTRICT")
+ {
+ //姝よ处鍙锋棤鏉冪櫥褰�
+ btnErrorMsg.TextID = R.MyInternationalizationString.ThisAccountHasNoAuthorityToLogin;
+ }
else if (stateCodeStr == "YOUDATANOISLOCALREGION")
{
//涓嶅湪鏈尯鍩燂紝闇�瑕侀噸瀹氬悜鍖哄煙鍚庡啀娆¤姹傜櫥褰�
--
Gitblit v1.8.0