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 | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index b059beb..358e286 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -28,6 +28,8 @@
{
//灏嗗綋鍓嶇殑鐢婚潰淇濆瓨鍒板唴瀛樺綋涓�
UserCenterLogic.AddActionForm(this);
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(1, this.FormID + " 鐣岄潰鎵撳紑");
}
/// <summary>
@@ -74,6 +76,9 @@
/// </summary>
public virtual void CloseForm()
{
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(1, this.FormID + " 鐣岄潰鍏抽棴");
+
//绉婚櫎鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
this.RemoveGatewayOnlinePush();
//绉婚櫎璁惧灞炴�у彉鏇存帹閫�
@@ -88,7 +93,6 @@
//浠庡垪琛ㄤ腑绉婚櫎(闃叉鐢婚潰浜岄噸娣诲姞)
UserCenterLogic.RemoveActionForm(this);
-
}
/// <summary>
@@ -267,8 +271,19 @@
{
alert.ConfirmClickEvent += () =>
{
- //鍥炶皟鍑芥暟
- action?.Invoke();
+ try
+ {
+ //鍥炶皟鍑芥暟
+ action?.Invoke();
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
+ }
action = null;
};
}
@@ -357,9 +372,11 @@
}
catch (Exception ex)
{
- string msg = ex.Message + "\r\n";
- msg += ex.TargetSite.ToString();
- this.ShowMassage(ShowMsgType.Error, msg);
+ //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
return null;
}
@@ -377,18 +394,6 @@
form.AddForm(parameter);
}
- #endregion
-
- #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
-
- /// <summary>
- /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
- /// </summary>
- public virtual void FormActionAgainEvent()
- {
- return;
- }
-
#endregion
}
}
--
Gitblit v1.8.0