From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 10:39:42 +0800
Subject: [PATCH] 同步了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 42 ++++++++++++++----------------------------
1 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index b778f68..ada9751 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -649,27 +649,22 @@
/// </summary>
public static void CloseAllOpenForm()
{
- var listForm = new List<CommonFormBase>();
- var listId = new List<string>();
- foreach (CommonFormBase form in UserCenterResourse.DicActionForm.Values)
+ while (UserView.HomePage.Instance.ChildrenCount > 0)
{
- if (form.FormID != "UserMainForm")
+ var view = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
+ if (view is CommonFormBase)
{
- listForm.Insert(0, form);
- listId.Add(form.FormID);
+ ((CommonFormBase)view).CloseForm();
+ }
+ else if (view is UserView.UserPage)
+ {
+ break;
+ }
+ else
+ {
+ view.RemoveFromParent();
}
}
- foreach (var id in listId)
- {
- UserCenterResourse.DicActionForm.Remove(id);
- }
-
- //鍏抽棴鎵�鏈夌敾闈�
- foreach (CommonFormBase form in listForm)
- {
- form.CloseForm();
- }
- listForm.Clear();
}
#endregion
@@ -791,9 +786,6 @@
//APP缂撳瓨鍔犺浇寮�濮�
UserCenterResourse.Option.AppCanSignout = false;
- //寮哄埗鎸囧畾涓嶅叧闂繘搴︽潯
- ProgressBar.SetCloseBarFlag(true);
-
//鍙湁鍦ㄤ綇瀹匢D涓嶄竴鏍风殑鏃跺�欐墠鍋氳繖涓搷浣�
if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId
|| Common.Config.Instance.Account != UserCenterResourse.Option.OldAccountId)
@@ -851,9 +843,6 @@
//鍒锋柊APP鍓嶄竴娆￠�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
- //娓呯┖寮哄埗鎸囧畾鏂囨湰鐨勯檮鍔犱俊鎭�
- ProgressBar.SetAppendText(string.Empty);
-
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
//if (result == 0)
//{
@@ -861,9 +850,6 @@
// HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
//}
}
-
- //鎭㈠鍙叧闂繘搴︽潯
- ProgressBar.SetCloseBarFlag(false);
//APP缂撳瓨鍔犺浇瀹屾垚
UserCenterResourse.Option.AppCanSignout = true;
@@ -1027,9 +1013,9 @@
Config.Instance.AdminRequestBaseUrl = string.Empty;
Config.Instance.AdminRequestToken = string.Empty;
- if (UserCenterResourse.UserInfo.AuthorityNo != 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
{
- //鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳鎵嶈兘杩欐牱鎼�, 杩欓噷蹇呴』鏄�2
+ //鏃朵唬鍙樹簡,杩欓噷绠＄悊鍛樺拰鎴愬憳閮借兘璋冪敤
return true;
}
var pra = new
--
Gitblit v1.8.0