2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -61,15 +61,14 @@
                    {
                        new System.Threading.Thread(async () =>
                        {
                            //启动ZigBee
                            ZigBee.Common.Application.Init();
                            //登录成功
                            var homes = await House.GetHomeLists();

                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                            //启动ZigBee

                            ZigBee.Common.Application.Init();

                            Room.InitAllRoom();
                            UserCenter.HdlRoomLogic.Current.InitAllRoom();

                            Application.RunOnMainThread(() =>
                            {
@@ -93,16 +92,14 @@
                        //登录失败，也直接进入主页
                        new System.Threading.Thread(async () =>
                        {
                            //启动ZigBee
                            ZigBee.Common.Application.Init();

                            //登录成功
                            var homes = await House.GetHomeLists();

                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                            //启动ZigBee

                            ZigBee.Common.Application.Init();

                            Room.InitAllRoom();
                            UserCenter.HdlRoomLogic.Current.InitAllRoom();

                            Application.RunOnMainThread(() =>
                            {
@@ -120,7 +117,7 @@
            else
            {
                //未登录弹出登录界面
                var accountLogin = new Device.Account.AccountLogin { };
                var accountLogin = new Login.AccountLogin { };
                Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
                accountLogin.Show();
            }
@@ -169,8 +166,6 @@
                    {
                        return -1;
                    }
                    //初始化管理员权限信息(里面有特殊判断了,可以直接调用)
                    await UserCenter.UserCenterLogic.InitAdminConnectMqttInfo();

                    var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
                    var revertData = responseDataObj;
@@ -178,11 +173,8 @@
                    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;
                    Config.Instance.LoginToken = revertData.Token;
                    if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
                    {
                        Config.Instance.AccountList.Add(revertData.Account);