From 159ec8ae413683e1ce134ec204d1c0b4d175baec Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 15:55:32 +0800
Subject: [PATCH] 2019.11.14

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index cd3d842..3afd627 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -72,27 +72,50 @@
         #region 鈻� 鍏抽棴鐣岄潰___________________________
 
         /// <summary>
+        /// 鐢婚潰鍏抽棴涔嬪墠(搴曞眰鍙樻洿,涓嶈兘閲嶈浇CloseForm鏂规硶浜�)
+        /// </summary>
+        public virtual void CloseFormBefore()
+        {
+        }
+
+        /// <summary>
+        /// 鐢婚潰鍏抽棴涔嬪悗(鏂板)
+        /// </summary>
+        public virtual void CloseFormAfter()
+        {
+        }
+
+        /// <summary>
         /// 鐢婚潰鍏抽棴
         /// </summary>
         public virtual void CloseForm()
         {
             //Log鍑哄姏
             HdlLogLogic.Current.WriteLog(1, this.FormID + " 鐣岄潰鍏抽棴");
+            try
+            {
+                //绉婚櫎鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
+                this.RemoveGatewayOnlinePush();
+                //绉婚櫎璁惧灞炴�у彉鏇存帹閫�
+                this.RemoveDeviceAttributePush();
 
-            //绉婚櫎鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
-            this.RemoveGatewayOnlinePush();
-            //绉婚櫎璁惧灞炴�у彉鏇存帹閫�
-            this.RemoveDeviceAttributePush();
+                //鍏抽棴杩涘害鏉�
+                this.CloseProgressBar();
 
-            //鍏抽棴杩涘害鏉�
-            this.CloseProgressBar();
+                //璋冪敤鐨勬槸Base鐨勭Щ闄ゆ帶浠跺嚱鏁�
+                //鑰屼笉鏄皟鐢╰his鐨勭Щ闄ゆ帶浠跺嚱
+                base.RemoveFromParent();
 
-            //璋冪敤鐨勬槸Base鐨勭Щ闄ゆ帶浠跺嚱鏁�
-            //鑰屼笉鏄皟鐢╰his鐨勭Щ闄ゆ帶浠跺嚱
-            base.RemoveFromParent();
-
-            //浠庡垪琛ㄤ腑绉婚櫎(闃叉鐢婚潰浜岄噸娣诲姞)
-            UserCenterLogic.RemoveActionForm(this);
+                //浠庡垪琛ㄤ腑绉婚櫎(闃叉鐢婚潰浜岄噸娣诲姞)
+                UserCenterLogic.RemoveActionForm(this);
+            }
+            catch (Exception ex)
+            {
+                //鍑虹幇鏈煡閿欒
+                this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+                //Log鍑哄姏
+                HdlLogLogic.Current.WriteLog(ex);
+            }
         }
 
         /// <summary>
@@ -370,7 +393,6 @@
                 }
                 var myMethod = form.GetType().GetMethod(method);
                 return myMethod.Invoke(form, parameter);
-                //return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0