From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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..b64f1d2 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;
}
@@ -382,11 +399,12 @@
#region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
/// <summary>
- /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
+ /// <para>鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�</para>
+ /// <para>閲嶅啓鐨勬椂鍊欒繑鍥炲�艰杩斿洖1(杩斿洖鍊兼槸缁欏簳灞備娇鐢ㄧ殑)</para>
/// </summary>
- public virtual void FormActionAgainEvent()
+ public virtual int FormActionAgainEvent()
{
- return;
+ return -1;
}
#endregion
--
Gitblit v1.8.0