From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 55e728a..04441be 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -53,7 +53,6 @@
if (Config.Instance.IsLogin)
{
//鏄剧ず鍚姩椤�
- this.ShowLoginLoadView();
CommonPage.Loading.Start();
UserCenter.HdlThreadLogic.Current.RunThread(() =>
@@ -66,15 +65,19 @@
{
var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb(true);
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ bool result = UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
UserCenter.HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.ReFreshControl();
CommonPage.Loading.Hide();
+ if (result == true)
+ {
+ //false:寮�鍚簡璋冭瘯鍔熻兘
+ UserPage.Instance.ReFreshControl();
+ }
});
}
else
@@ -102,16 +105,6 @@
Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
accountLogin.ShowForm();
}
- }
-
- /// <summary>
- /// 鏄剧ず鍚姩椤�
- /// </summary>
- public void ShowLoginLoadView()
- {
- var loginLoad = new LoginLoading { };
- CommonPage.Instance.AddChidren(loginLoad);
- loginLoad.Show();
}
/// <summary>
--
Gitblit v1.8.0