From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 10:34:17 +0800
Subject: [PATCH] IOS使用新的项目名称

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs |   63 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index b64f1d2..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>
@@ -368,7 +391,8 @@
                 {
                     return null;
                 }
-                return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);
+                var myMethod = form.GetType().GetMethod(method);
+                return myMethod.Invoke(form, parameter);
             }
             catch (Exception ex)
             {
@@ -394,19 +418,6 @@
             form.AddForm(parameter);
         }
 
-        #endregion
-
-        #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
-
-        /// <summary>
-        /// <para>鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�</para>
-        /// <para>閲嶅啓鐨勬椂鍊欒繑鍥炲�艰杩斿洖1(杩斿洖鍊兼槸缁欏簳灞備娇鐢ㄧ殑)</para>
-        /// </summary>
-        public virtual int FormActionAgainEvent()
-        {
-            return -1;
-        }
-
         #endregion
     }
 }

--
Gitblit v1.8.0