From e327510c7329aa9a95e62a460ec659ea0c9563ad Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 19:05:47 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
old mode 100755
new mode 100644
index 471a499..23fc8b2
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -31,10 +31,10 @@
//btnConfirm.IsSelected = false;
if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
{
- if (titleId == StringId.ModifyMemberNickname)
- {
- return;
- }
+ //if (titleId == StringId.ModifyMemberNickname)
+ //{
+ // return;
+ //}
string tipMsgString = "";
if (string.IsNullOrEmpty(editText.Text.Trim()))
{
@@ -124,6 +124,21 @@
//TextAlignment = TextAlignment.CenterLeft ,
};
editView.AddChidren(etParater);
+
+ Button btnClear = new Button()
+ {
+ X = Application.GetRealWidth(218-25),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
+ UnSelectedImagePath = "Public/ClearIcon.png",
+ };
+ editView.AddChidren(btnClear);
+
+ btnClear.MouseUpEventHandler = (sender, e) =>
+ {
+ etParater.Text = "";
+ };
etParater.TextChangeEventHandler = (sender, e) =>
{
@@ -604,7 +619,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Complete,
+ TextID = StringId.Confirm,
};
topView.AddChidren(btnConfrim);
--
Gitblit v1.8.0