From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs
index f5da451..7126c4d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs
@@ -12,10 +12,6 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 鍗曞嚮寮硅捣浜嬩欢
- /// </summary>
- public Action<object, MouseEventArgs> ButtonClickEvent;
- /// <summary>
/// 鐘舵�佽缃殑浜嬩欢(浼氶噸杞藉簳灞傛晥鏋�)
/// </summary>
public Action<bool> SelectStatuEvent;
@@ -23,10 +19,6 @@
/// 鏄惁鍚敤鐐逛寒鍔熻兘(榛樿鍚敤)
/// </summary>
public bool UseClickStatu = true;
- /// <summary>
- /// 鑳藉惁鐐瑰嚮
- /// </summary>
- public bool CanClick = true;
/// <summary>
/// 鍘熸潵鐨勮儗鏅壊
/// </summary>
@@ -54,11 +46,13 @@
/// <summary>
/// 鍋氭垚涓�涓偣鍑诲悗鑳藉鏄剧ず鐐瑰嚮鐘舵�佺殑鎺т欢
/// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public FrameLayoutStatuControl(int i_ChidrenYaxis = 0)
{
this.chidrenYaxis = i_ChidrenYaxis;
+ //缃┖搴曞眰鐨勪簨浠�
+ this.MouseUpEventHandler = null;
this.MouseUpEventHandler += ChildrenUpEvent;
this.MouseDownEventHandler += ChildrenDownEvent;
}
@@ -186,7 +180,7 @@
/// </summary>
/// <param name="view">瀛愭帶浠�</param>
/// <param name="chidrenBindMode">缁戝畾妯″紡</param>
- public void AddChidren(View view, ChidrenBindMode chidrenBindMode = ChidrenBindMode.BindAll)
+ public void AddChidren(View view, ChidrenBindMode chidrenBindMode = ChidrenBindMode.BindEvent)
{
this.oldBackColor = this.BackgroundColor;
@@ -194,6 +188,15 @@
//缁戝畾瀛愭帶浠朵簨浠�
this.BindChidrenEvent(view, chidrenBindMode);
+ }
+
+ /// <summary>
+ /// 娣诲姞瀛愭帶浠�
+ /// </summary>
+ /// <param name="view"></param>
+ public override void AddChidren(View view)
+ {
+ this.AddChidren(view, ChidrenBindMode.NotBind);
}
#endregion
@@ -301,7 +304,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
System.Threading.Thread.Sleep(waiTime);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//璁剧疆涓嶉�夋嫨鐘舵��
this.SetClickNotSelectStatu();
@@ -323,7 +326,6 @@
/// </summary>
public override void RemoveFromParent()
{
- this.ButtonClickEvent = null;
this.SelectStatuEvent = null;
base.RemoveFromParent();
@@ -332,11 +334,6 @@
#endregion
#region 鈻� Log鍑哄姏____________________________
-
- /// <summary>
- /// 璇ユ帶浠舵墍灞炵殑鐣岄潰鍚嶅瓧
- /// </summary>
- private string formName = null;
/// <summary>
/// Log鍑哄姏
--
Gitblit v1.8.0