From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3

---
 ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
old mode 100755
new mode 100644
index 448dc50..3c52135
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
@@ -103,7 +103,8 @@
                 {
                     try
                     {
-                        UserPage.Instance.Fresh();
+                        HomePage.Instance.ShowLoginLoadView();
+
                         CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
                         Action action = async () => {
                             var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
@@ -115,24 +116,23 @@
                                     {
                                         BindAuthUser(Config.Instance.Guid, OpenID);
                                     }
+                                    //鐧诲綍鎴愬姛
+                                    var homes = await House.GetHomeLists();
+                      
+                                    //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+                                    //鍚姩ZigBee
                                     ZigBee.Common.Application.Init();
 
-                                    //鐧诲綍鎴愬姛
-                                    var homes = await House.GetHomeLists();
-
-                                    //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
-                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
-
-                                    Shared.Common.Room.CanInitAllRoom = true;
                                     Shared.Common.Room.InitAllRoom();
 
                                     Application.RunOnMainThread(() =>
                                     {
-                                        UserPage.Instance.Fresh();
                                         CommonPage.Loading.Hide();
                                         this.RemoveFromParent();
                                         CommonPage.Instance.RemoveViewByTag("Register");
                                         CommonPage.Instance.RemoveViewByTag("Login");
+                                        UserPage.Instance.Fresh();
                                     });
                                 })
                                 { IsBackground = true }.Start();

--
Gitblit v1.8.0