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 | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs index be5e2ba..bbb9565 100755 --- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs +++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs @@ -62,13 +62,13 @@ new System.Threading.Thread(async () => { //鐧诲綍鎴愬姛 - var homes = await House.GetHomeLists(); + var homes = await House.GetHomeLists(); + //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ + await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread(); //鍚姩ZigBee ZigBee.Common.Application.Init(); - //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ - await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread(); - Room.InitAllRoom(); + UserCenter.HdlRoomLogic.Current.InitAllRoom(); Application.RunOnMainThread(() => { @@ -93,14 +93,13 @@ new System.Threading.Thread(async () => { //鐧诲綍鎴愬姛 - var homes = await House.GetHomeLists(); + var homes = await House.GetHomeLists(); + //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ + await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread(); //鍚姩ZigBee ZigBee.Common.Application.Init(); - //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ - await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread(); - - Room.InitAllRoom(); + UserCenter.HdlRoomLogic.Current.InitAllRoom(); Application.RunOnMainThread(() => { @@ -118,9 +117,9 @@ else { //鏈櫥褰曞脊鍑虹櫥褰曠晫闈� - var accountLogin = new Device.Account.AccountLogin { }; + var accountLogin = new Login.AccountLogin { }; Shared.Common.CommonPage.Instance.AddChidren(accountLogin); - accountLogin.Show(); + accountLogin.ShowForm(); } } @@ -167,24 +166,17 @@ { return -1; } - //鍒濆鍖栫鐞嗗憳鏉冮檺淇℃伅(閲岄潰鏈夌壒娈婂垽鏂簡,鍙互鐩存帴璋冪敤) - await UserCenter.UserCenterLogic.InitAdminConnectMqttInfo(); 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.MqttKey = revertData.MqttKey; Config.Instance.LoginDateTime = DateTime.Now; - Config.Instance.ConnectZigbeeMqttBrokerPwd = revertData.ConnectZigbeeMqttBrokerPwd; - Config.Instance.ConnectZigbeeMqttClientId = revertData.ConnectZigbeeMqttClientId; - Config.Instance.ZigbeeMqttBrokerLoadSubDomain = revertData.ZigbeeMqttBrokerLoadSubDomain; - if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null) - { - Config.Instance.AccountList.Add(revertData.Account); - } + Config.Instance.LoginToken = revertData.Token; isLoginSuccess = 1; var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID(); System.Console.WriteLine($"鍚庡彴鐧诲綍鎴愬姛--{Config.Instance.LoginDateTime}"); -- Gitblit v1.8.0