From ade5917841b0fdcb1df7353ef7c56b1a1bdc9282 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:03:32 +0800
Subject: [PATCH] 删除 Gateway.Ios文件
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs
index efabd5d..1b53982 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs
@@ -16,9 +16,13 @@
/// </summary>
public bool UseClickStatu = true;
/// <summary>
- /// 鍘熸潵鐨勮儗鏅壊(杩笉寰楀繁,杩欎釜涓滆タ闇�瑕佸紑鏀惧嚭鍘�)
+ /// 鍘熸潵鐨勮儗鏅壊(杩笉寰楀繁,杩欎釜涓滆タ闇�瑕佸紑鏀惧嚭鍘�,璁剧疆涓�娆′箣鍚庡皢涓嶄細鍐嶈缃�)
/// </summary>
public uint oldBackgroundColor = 0;
+ /// <summary>
+ /// 鐐瑰嚮鐘舵�佺殑鑳屾櫙鑹�(杩笉寰楀繁,杩欎釜涓滆タ闇�瑕佸紑鏀惧嚭鍘�,榛樿浣跨敤搴曞眰璁剧疆鐨�)
+ /// </summary>
+ public uint clickStatuColor = UserCenterColor.Current.ButtonClickStatuColor;
/// <summary>
/// 鏄惁澶勪簬閫夋嫨鐘舵��
/// </summary>
@@ -37,7 +41,7 @@
this.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
this.TextAlignment = TextAlignment.Center;
- this.MouseDownEventHandler += this.Button_MouseDownEvent;
+ this.ButtonDownClickEvent += this.Button_MouseDownEvent;
}
#endregion
@@ -54,7 +58,7 @@
if (this.UseClickStatu == false)
{
//姘镐箙绉婚櫎
- this.MouseDownEventHandler -= this.Button_MouseDownEvent;
+ this.ButtonDownClickEvent -= Button_MouseDownEvent;
return;
}
if (base.CanClick == false || isSelcetStatu == true)
@@ -62,11 +66,14 @@
//鎺т欢涓嶈兘鐐瑰嚮,鎴栬�呭綋鍓嶅浜庨�夋嫨鐘舵��,鍒欎笉鑳借Е鍙�
return;
}
-
+ if (this.oldBackgroundColor == 0)
+ {
+ this.oldBackgroundColor = this.BackgroundColor;
+ }
//璁剧疆鐐瑰嚮鍚庣殑鐘舵��
this.SetClickStatu();
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
System.Threading.Thread.Sleep(ControlCommonResourse.StatuChangedWaitTime);
Application.RunOnMainThread(() =>
@@ -79,8 +86,7 @@
//璁剧疆闈炵偣鍑诲悗鐨勭姸鎬�
this.SetNotClickStatu();
});
- })
- { IsBackground = true }.Start();
+ });
}
/// <summary>
@@ -89,11 +95,7 @@
public override void SetClickStatu()
{
this.isSelcetStatu = true;
- if (this.oldBackgroundColor == 0)
- {
- this.oldBackgroundColor = this.BackgroundColor;
- }
- this.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
+ this.BackgroundColor = clickStatuColor;
}
/// <summary>
@@ -102,10 +104,6 @@
public override void SetNotClickStatu()
{
this.isSelcetStatu = false;
- if (this.oldBackgroundColor == 0)
- {
- this.oldBackgroundColor = this.BackgroundColor;
- }
//璁剧疆涓嶉�夋嫨鐘舵��
this.BackgroundColor = oldBackgroundColor;
}
--
Gitblit v1.8.0