From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs |   21 ++-------------------
 1 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index 0d36ad3..358e286 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -282,9 +282,7 @@
                             this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
 
                             //Log鍑哄姏
-                            string errorMsg = ex.Message + "\r\n";
-                            errorMsg += ex.TargetSite.ToString();
-                            HdlLogLogic.Current.WriteLog(-1, errorMsg);
+                            HdlLogLogic.Current.WriteLog(ex);
                         }
                         action = null;
                     };
@@ -378,9 +376,7 @@
                 this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
 
                 //Log鍑哄姏
-                string msg = ex.Message + "\r\n";
-                msg += ex.TargetSite.ToString();
-                HdlLogLogic.Current.WriteLog(-1, msg);
+                HdlLogLogic.Current.WriteLog(ex);
 
                 return null;
             }
@@ -398,19 +394,6 @@
             form.AddForm(parameter);
         }
 
-        #endregion
-
-        #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
-
-        /// <summary>
-        /// <para>鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�</para>
-        /// <para>閲嶅啓鐨勬椂鍊欒繑鍥炲�艰杩斿洖1(杩斿洖鍊兼槸缁欏簳灞備娇鐢ㄧ殑)</para>
-        /// </summary>
-        public virtual int FormActionAgainEvent()
-        {
-            return -1;
-        }
-
         #endregion
     }
 }

--
Gitblit v1.8.0