From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
index a79ddb8..81194bc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
@@ -36,17 +36,6 @@
/// </summary>
public int chidrenYaxis = 0;
- /// <summary>
- /// 鍦嗚搴�(瀹夊崜鍜孖OS鎴栬闇�瑕侀缂栬瘧)
- /// </summary>
- public uint RadiusEx
- {
- set
- {
- this.Radius = value;
- }
- }
-
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -61,15 +50,7 @@
this.MouseUpEventHandler += ChildrenUpEvent;
this.MouseDownEventHandler += ChildrenDownEvent;
- }
-
- /// <summary>
- /// 鍋氭垚涓�涓櫘閫氱殑FrameLayout鎺т欢
- /// </summary>
- /// <param name="flage">娌″暐鐢ㄧ殑涓滆タ</param>
- public FrameLayoutControl(bool flage)
- {
- }
+ }
#endregion
@@ -215,8 +196,19 @@
//LOG鍑哄姏
this.WriteLog();
}
- //璋冪敤濮旀墭
- ButtonClickEvent?.Invoke(sender, e);
+ try
+ {
+ //璋冪敤濮旀墭
+ ButtonClickEvent?.Invoke(sender, e);
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ alert.Show();
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
+ }
}
#endregion
--
Gitblit v1.8.0