From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1

---
 ZigbeeApp/Shared/Phone/UserView/HomePage.cs |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 2607704..bbb9565 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -119,7 +119,7 @@
                 //鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
                 var accountLogin = new Login.AccountLogin { };
                 Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
-                accountLogin.Show();
+                accountLogin.ShowForm();
             }
         }
 
@@ -168,17 +168,15 @@
                     }
 
                     var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
-                    var revertData = responseDataObj;
+                    var revertData = responseDataObj;
+                    //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+                    UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
                     Config.Instance.Account = revertData.Account;
                     Config.Instance.Password = password;
                     Config.Instance.MD5PWD = revertData.MD5PWD;
                     Config.Instance.Guid = revertData.Guid;
                     Config.Instance.LoginDateTime = DateTime.Now;
                     Config.Instance.LoginToken = revertData.Token;
-                    if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
-                    {
-                        Config.Instance.AccountList.Add(revertData.Account);
-                    }
                     isLoginSuccess = 1;
                     var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                     System.Console.WriteLine($"鍚庡彴鐧诲綍鎴愬姛--{Config.Instance.LoginDateTime}");

--
Gitblit v1.8.0