From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs
old mode 100755
new mode 100644
index 47a9c79..a623b68
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs
@@ -10,8 +10,8 @@
public class SearchTextControl : FrameLayout
{
#region 鈻� 鍙橀噺澹版槑__________________________
- /// <summary>
- /// 涓轰簡瀵瑰簲瀛愮嚎绋�
+ /// <summary>
+ /// 涓轰簡瀵瑰簲瀛愮嚎绋�
/// </summary>
private string m_Text = string.Empty;
/// <summary>
@@ -21,13 +21,13 @@
public string Text
{
get
- {
+ {
return m_Text;
}
- set
- {
- this.m_Text = value;
- txtSearch.Text = this.m_Text;
+ set
+ {
+ this.m_Text = value;
+ txtSearch.Text = this.m_Text;
}
}
/// <summary>
@@ -38,13 +38,13 @@
/// 鍥炶皟鍑芥暟
/// </summary>
private Action<string> actionMethod = null;
- /// <summary>
- /// 娌℃湁杈撳叆閿�肩殑鏄剧ず鏂囨湰
+ /// <summary>
+ /// 娌℃湁杈撳叆閿�肩殑鏄剧ず鏂囨湰
/// </summary>
- private string tipText = string.Empty;
-
+ private string tipText = string.Empty;
+
#endregion
-
+
#region 鈻� 鍒濆鍖朹___________________________
/// <summary>
/// 鍒朵綔涓�涓牴鎹敭鍊艰繘琛屾悳绱㈢殑鎺т欢
@@ -58,9 +58,9 @@
this.tipText = i_tipText;
//妗屽竷鎺т欢
this.Width = Application.GetRealWidth(width);
- this.Height = Application.GetRealHeight(height);
- this.Gravity = Gravity.CenterHorizontal;
- this.Radius = (uint)Application.GetMinRealAverage(6);
+ this.Height = Application.GetRealHeight(height);
+ this.Gravity = Gravity.CenterHorizontal;
+ this.Radius = (uint)Application.GetRealHeight(17);
this.BackgroundColor = 0xfff8f7f7;
}
@@ -69,17 +69,17 @@
/// </summary>
/// <param name="action">鍥炶皟鍑芥暟锛氬�兼槸杈撳叆鐨勫叧閿瓧</param>
private void InitControl(Action<string> action)
- {
- //鎼滅储鍥炬爣
- var btnIcon = new IconViewControl(52);
- btnIcon.Gravity = Gravity.CenterVertical;
- btnIcon.X = ControlCommonResourse.XXLeft;
+ {
+ //鎼滅储鍥炬爣
+ var btnIcon = new IconViewControl(52);
+ btnIcon.Gravity = Gravity.CenterVertical;
+ btnIcon.X = ControlCommonResourse.XXLeft;
btnIcon.UnSelectedImagePath = "Item/Search.png";
- this.AddChidren(btnIcon);
-
- //鍙栨秷
- var btnCancel = new IconViewControl(58);
- btnCancel.X = this.Width - ControlCommonResourse.XXLeft / 2 - btnCancel.IconSize;
+ this.AddChidren(btnIcon);
+
+ //鍙栨秷
+ var btnCancel = new IconViewControl(58);
+ btnCancel.X = this.Width - ControlCommonResourse.XXLeft / 2 - btnCancel.IconSize;
btnCancel.UnSelectedImagePath = "Item/CancelIcon.png";
btnCancel.Gravity = Gravity.CenterVertical;
this.AddChidren(btnCancel);
@@ -91,11 +91,11 @@
//杈撳叆鏂囨湰
int textWidth = btnCancel.X - Application.GetRealWidth(132 + 10);
txtSearch = new TextInputControl(textWidth, Application.GetRealHeight(49), false);
- txtSearch.X = Application.GetRealWidth(132);
+ txtSearch.X = Application.GetRealWidth(132);
txtSearch.PlaceholderText = this.tipText;
txtSearch.Gravity = Gravity.CenterVertical;
txtSearch.TextSize = 12;
- txtSearch.PlaceholderTextColor = UserCenterColor.Current.TextGrayColor1;
+ txtSearch.PlaceholderTextColor = UserCenterColor.Current.TextGrayColor1;
this.AddChidren(txtSearch);
string oldText = string.Empty;
@@ -113,11 +113,11 @@
//鍏佽鎵ц鍥炶皟鍑芥暟
this.isCanSearch = true;
};
- }
+ }
#endregion
-
+
#region 鈻� 缁戝畾浜嬩欢__________________________
-
+
/// <summary>
/// 缁戝畾浜嬩欢
/// </summary>
@@ -134,9 +134,9 @@
}
#endregion
-
+
#region 鈻� 寮�鍚嚎绋媉_________________________
-
+
/// <summary>
/// 鑳藉惁鎵ц鎼滅储
/// </summary>
@@ -177,18 +177,18 @@
//閭ｅ氨璇存槑锛岀敤鎴峰啀娆¤緭鍏ヤ簡閿�硷紝杩欎釜鏃跺�欙紝璁╃嚎绋嬬户缁窇涓嬪幓
}
});
- }
+ }
#endregion
-
+
#region 鈻� 鎺т欢鎽ф瘉__________________________
- /// <summary>
- /// 鎺т欢鎽ф瘉
+ /// <summary>
+ /// 鎺т欢鎽ф瘉
/// </summary>
- public override void RemoveFromParent()
- {
- actionMethod = null;
- base.RemoveFromParent();
+ public override void RemoveFromParent()
+ {
+ actionMethod = null;
+ base.RemoveFromParent();
}
#endregion
--
Gitblit v1.8.0