合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs

@@ -298,15 +298,10 @@
                    {
                        return;
                    }
                    this.RemoveFromParent();
                    Application.MainPage?.RemoveViewByTag("Login");

                    UserPage.Instance.Fresh();

                    HomePage.Instance.ShowLoginLoadView();
                    new System.Threading.Thread(async () =>
                    {
                        //启动ZigBee
                        ZigBee.Common.Application.Init();
                        var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
                        var revertData = responseDataObj;
                        Config.ReFresh();
@@ -326,15 +321,17 @@
                        Config.Instance.MD5PWD = revertData.MD5PWD;
                        Config.Instance.Save();
                        var resultRegID = await CommonPage.Instance.PushRegID();
                        var homes = await House.GetHomeLists();

                        var homes = await House.GetHomeLists();

                        //启动ZigBee

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

                        Shared.Common.Room.CanInitAllRoom = true;
                        Shared.Common.Room.InitAllRoom();
                        Application.RunOnMainThread(() =>
                        {
                            this.RemoveFromParent();
                            CommonPage.Instance.RemoveViewByTag("Login");
                            UserPage.Instance.Fresh();
                            CommonPage.Loading.Hide();
                        });