From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本

---
 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index f10e1fc..25cb57f 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);
@@ -1191,6 +1190,11 @@
                     //璇峰厛鑾峰彇楠岃瘉鐮�
                     btnErrorMsg.TextID = R.MyInternationalizationString.NORECORD;
                 }
+                else if (stateCodeStr == "BERESTRICT")
+                {
+                    //姝よ处鍙锋棤鏉冪櫥褰�
+                    btnErrorMsg.TextID = R.MyInternationalizationString.ThisAccountHasNoAuthorityToLogin;
+                }
                 else if (stateCodeStr == "YOUDATANOISLOCALREGION")
                 {
                     //涓嶅湪鏈尯鍩燂紝闇�瑕侀噸瀹氬悜鍖哄煙鍚庡啀娆¤姹傜櫥褰�

--
Gitblit v1.8.0