From 4dce704aaf8587cf3f91cf88f2208315a03c4cbb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 13:54:58 +0800
Subject: [PATCH] 先上传一个版本

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 97d8067..bb2ab6f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -428,8 +428,13 @@
                         var actionForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
                         if (actionForm != null && actionForm is CommonFormBase)
                         {
-                            //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
-                            CallFormActionAgainEvent(form, index);
+                            string formId = ((CommonFormBase)actionForm).FormID;
+                            //瀵瑰簲寰愭缁ф壙浜嗗簳灞傦紝浣嗘槸涓嶅垵濮嬪寲鏁版嵁鐨勯棶棰�
+                            if (UserCenterResourse.listActionFormId.Contains(formId) == true)
+                            {
+                                //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
+                                CallFormActionAgainEvent(form, index);
+                            }
                         }
                         else if (actionForm != null && actionForm is UserView.UserPage)
                         {
@@ -655,6 +660,8 @@
 
                 HdlThreadLogic.Current.RunMain(() =>
                 {
+                    //鏀惰捣宸﹁彍鍗�
+                    CommonPage.Instance.CloseLeftMenu();
                     //鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
                     CloseAllOpenForm();
 
@@ -676,7 +683,7 @@
         /// 鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
         /// </summary>
         /// <param name="tagetFrom">鐩爣鐣岄潰,濡傛灉鎸囧畾浜嗙殑璇�,鍒欏叧闂洰鏍囩晫闈笂灞傜殑鍏ㄩ儴鐣岄潰(瀹冭嚜韬笉鍏抽棴)</param>
-        public static void CloseAllOpenForm(string tagetFrom = "")
+        public static void CloseAllOpenForm(string tagetFrom = null)
         {
             while (UserView.HomePage.Instance.ChildrenCount > 0)
             {

--
Gitblit v1.8.0