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/Login/AccountLoginForm.cs | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index 67d3581..9fac1a9 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -199,7 +199,6 @@
{
btnTiyan.CanClick = false;
//鏄剧ず鍚姩椤�
- HomePage.Instance.ShowLoginLoadView();
HdlThreadLogic.Current.RunThread(() =>
{
//鍒濆鍖栧叏閮ㄤ綋楠屾暟鎹�
@@ -836,23 +835,26 @@
var re = isBindAuthAsync(authStr);
if (re)
{
- HdlThreadLogic.Current.RunMain(() =>
- {
- //鐩存帴鐧诲綍
- HomePage.Instance.ShowLoginLoadView();
- });
+ ProgressBar.Show(Language.StringByID(R.MyInternationalizationString.Logining));
+
var resultRegID = Shared.Common.CommonPage.Instance.PushRegID();
var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- UserCenterLogic.InitUserCenterMenmoryAndThread();
+ bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();
+
//鍚姩ZigBee
ZigBee.Common.Application.Init();
HdlThreadLogic.Current.RunMain(() =>
{
+ ProgressBar.Close();
this.RemoveFromParent();
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.ReFreshControl();
+ if (result == true)
+ {
+ //false:寮�鍚簡璋冭瘯鍔熻兘
+ UserPage.Instance.ReFreshControl();
+ }
});
}
else
@@ -1091,11 +1093,6 @@
//Error 涓嶈兘鐩存帴浠庢湇鍔″櫒鍙栵紝鍙兘鏍规嵁鐘舵�佺爜閫愪竴鍒ゆ柇
if (stateCodeStr == "SUCCESS")
{
- HdlThreadLogic.Current.RunMain(() =>
- {
- //鏄剧ず鍚姩椤�
- HomePage.Instance.ShowLoginLoadView();
- });
//瀛樺偍鏁版嵁
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
var revertData = responseDataObj;
@@ -1113,7 +1110,8 @@
var resultRegID = CommonPage.Instance.PushRegID();
var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- UserCenterLogic.InitUserCenterMenmoryAndThread();
+ bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();
+
//鍚姩ZigBee
ZigBee.Common.Application.Init();
@@ -1122,7 +1120,11 @@
CommonPage.Loading.Hide();
this.RemoveFromParent();
CommonPage.Instance.RemoveViewByTag("Login");
- UserPage.Instance.ReFreshControl();
+ if (result == true)
+ {
+ //false:寮�鍚簡璋冭瘯鍔熻兘
+ UserPage.Instance.ReFreshControl();
+ }
});
return;
}
--
Gitblit v1.8.0