From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs
old mode 100755
new mode 100644
index e1e38b3..b9703db
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs
@@ -1,98 +1,98 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
- /// <summary>
- /// Icon鎺т欢鐨勫叡閫�
- /// </summary>
- public class IconControlCommon : ButtonBase
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鏄惁鍚敤鐐逛寒鍔熻兘(榛樿涓嶅惎鐢�)
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// Icon鎺т欢鐨勫叡閫�
+ /// </summary>
+ public class IconControlCommon : ButtonBase
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鏄惁鍚敤鐐逛寒鍔熻兘(榛樿涓嶅惎鐢�)
/// </summary>
- public bool UseClickStatu = false;
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// Icon鎺т欢鐨勫叡閫�
- /// </summary>
- public IconControlCommon()
- {
- //杩欎釜浜嬩欢鏄悶鐐逛寒鐗规晥鐨�
- this.ButtonDownClickEvent += this.Button_MouseDownEvent;
- }
-
- #endregion
-
- #region 鈻� 鎺т欢鐐逛寒鐗规晥_______________________
-
- /// <summary>
- /// 鍗曞嚮鎸変笅浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
+ public bool UseClickStatu = false;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// Icon鎺т欢鐨勫叡閫�
+ /// </summary>
+ public IconControlCommon()
+ {
+ //杩欎釜浜嬩欢鏄悶鐐逛寒鐗规晥鐨�
+ this.ButtonDownClickEvent += this.Button_MouseDownEvent;
+ }
+
+ #endregion
+
+ #region 鈻� 鎺т欢鐐逛寒鐗规晥_______________________
+
+ /// <summary>
+ /// 鍗曞嚮鎸変笅浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
/// <param name="e"></param>
- private void Button_MouseDownEvent(object sender, MouseEventArgs e)
- {
- if (this.UseClickStatu == false || string.IsNullOrEmpty(this.SelectedImagePath) == true)
- {
- //姘镐箙绉婚櫎
- this.ButtonDownClickEvent -= Button_MouseDownEvent;
- return;
- }
- if (base.CanClick == false || this.IsSelected == true)
- {
- //鎺т欢涓嶈兘鐐瑰嚮,鎴栬�呭綋鍓嶅浜庨�夋嫨鐘舵��,鍒欎笉鑳借Е鍙�
- return;
- }
- //璁剧疆澶勪簬閫夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
- this.SetSelectPictrue();
-
- //璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
- this.SetUnSelectPictrue(true);
- }
-
- /// <summary>
- /// 璁剧疆澶勪簬閫夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
- /// </summary>
- public void SetSelectPictrue()
- {
- this.IsSelected = true;
- }
-
- /// <summary>
- /// 璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
- /// </summary>
- /// <param name="waitTime">杩藉姞鍙橀噺:鏄惁绛夊緟</param>
- public void SetUnSelectPictrue(bool waitTime)
- {
- if (waitTime == false)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //璁剧疆涓嶉�夋嫨鐘舵��
- this.IsSelected = false;
- });
- }
- else
- {
- HdlThreadLogic.Current.RunThread(() =>
- {
- System.Threading.Thread.Sleep(ControlCommonResourse.StatuChangedWaitTime);
- HdlThreadLogic.Current.RunMain(() =>
- {
- //璁剧疆涓嶉�夋嫨鐘舵��
- this.IsSelected = false;
- });
- });
- }
- }
- #endregion
- }
-}
+ private void Button_MouseDownEvent(object sender, MouseEventArgs e)
+ {
+ if (this.UseClickStatu == false || string.IsNullOrEmpty(this.SelectedImagePath) == true)
+ {
+ //姘镐箙绉婚櫎
+ this.ButtonDownClickEvent -= Button_MouseDownEvent;
+ return;
+ }
+ if (base.CanClick == false || this.IsSelected == true)
+ {
+ //鎺т欢涓嶈兘鐐瑰嚮,鎴栬�呭綋鍓嶅浜庨�夋嫨鐘舵��,鍒欎笉鑳借Е鍙�
+ return;
+ }
+ //璁剧疆澶勪簬閫夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
+ this.SetSelectPictrue();
+
+ //璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
+ this.SetUnSelectPictrue(true);
+ }
+
+ /// <summary>
+ /// 璁剧疆澶勪簬閫夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
+ /// </summary>
+ public void SetSelectPictrue()
+ {
+ this.IsSelected = true;
+ }
+
+ /// <summary>
+ /// 璁剧疆澶勪簬闈為�夋嫨鐘舵�佹椂,鏄剧ず鐨勫浘鏍�
+ /// </summary>
+ /// <param name="waitTime">杩藉姞鍙橀噺:鏄惁绛夊緟</param>
+ public void SetUnSelectPictrue(bool waitTime)
+ {
+ if (waitTime == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆涓嶉�夋嫨鐘舵��
+ this.IsSelected = false;
+ });
+ }
+ else
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ System.Threading.Thread.Sleep(ControlCommonResourse.StatuChangedWaitTime);
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆涓嶉�夋嫨鐘舵��
+ this.IsSelected = false;
+ });
+ });
+ }
+ }
+ #endregion
+ }
+}
--
Gitblit v1.8.0