From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本

---
 ZigbeeApp/Shared/Phone/UserView/HomePage.cs |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 5b29ee7..8503e8e 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -56,24 +56,41 @@
                 this.ShowLoginLoadView();
                 CommonPage.Loading.Start();
 
-                UserCenter.HdlThreadLogic.Current.RunThread(async () =>
+                UserCenter.HdlThreadLogic.Current.RunThread(() =>
                 {
                     //鐧诲綍
-                    var loginSuccess = await LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+                    var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+
                     //鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
                     if (loginSuccess == 1 || loginSuccess == 2)
                     {
-                        var homes = await House.GetHomeLists();
+                        var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();
                         //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
-                        await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+                        UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                         //鍚姩ZigBee
                         ZigBee.Common.Application.Init();
 
                         UserCenter.HdlThreadLogic.Current.RunMain(() =>
                         {
                             CommonPage.Instance.RemoveViewByTag("Login");
-                            UserPage.Instance.Fresh();
+                            UserPage.Instance.ReFreshControl();
                             CommonPage.Loading.Hide();
+                        });
+                    }
+                    else
+                    {
+                        //璁惧畾涓�涓椂闂�
+                        Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+                        Config.Instance.Save();
+
+                        UserCenter.HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            CommonPage.Loading.Hide();
+                            CommonPage.Instance.RemoveViewByTag("Login");
+                            //鐧诲綍寮瑰嚭鐧诲綍鐣岄潰
+                            var accountLogin = new Login.AccountLoginForm { };
+                            Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
+                            accountLogin.ShowForm();
                         });
                     }
                 });
@@ -81,7 +98,7 @@
             else
             {
                 //鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
-                var accountLogin = new Login.AccountLogin { };
+                var accountLogin = new Login.AccountLoginForm { };
                 Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
                 accountLogin.ShowForm();
             }
@@ -105,7 +122,7 @@
         /// <param name="password">Password.</param>
         /// <param name="source">Source.</param>
         /// <param name="company">Company.</param>
-        public async System.Threading.Tasks.Task<int> LoginByPWDAsync(string account, string password, string source = "", int company = 0)
+        public int LoginByPWDAsync(string account, string password, string source = "", int company = 0)
         {
             var isLoginSuccess = -1;
             var requestObj = new SendDataToServer.LoginObj
@@ -116,7 +133,8 @@
                 Company = company
             };
             var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
-            var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));
+            //鐧婚檰鎺ュ彛鐗规畩,闇�瑕佸揩涓�鐐硅闂�,璁剧疆3绉掕秴鏃�
+            var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson), 3);
             if (revertObj == null)
             {
                 return 2;
@@ -128,7 +146,7 @@
                 var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
                 var revertData = responseDataObj;
                 //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
-                UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
+                Config.Instance.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
                 Config.Instance.Account = revertData.Account;
                 Config.Instance.Password = password;
                 Config.Instance.MD5PWD = revertData.MD5PWD;
@@ -136,7 +154,7 @@
                 Config.Instance.LoginDateTime = DateTime.Now;
                 Config.Instance.LoginToken = revertData.Token;
                 //涓婃姤璁惧ID
-                await CommonPage.Instance.PushRegID();
+                CommonPage.Instance.PushRegID();
                 isLoginSuccess = 1;
             }
             else if (stateCodeStr == "YOUDATANOISLOCALREGION")
@@ -145,7 +163,7 @@
                 var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginLocalRegionRes>(revertObj.ResponseData.ToString());
                 CommonPage.RequestHttpsHost = responseDataObj.RegionServer;
                 //鍐嶆鐧诲綍
-                return await this.LoginByPWDAsync(account, password, source, company);
+                return this.LoginByPWDAsync(account, password, source, company);
             }
             if (stateCodeStr == "NOTVERIFY")
             {

--
Gitblit v1.8.0