From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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..4e3c6b1
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -28,15 +29,22 @@
btnConfirm.MouseUpEventHandler += (sender, e) =>
{
- //btnConfirm.IsSelected = false;
- if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
+ var text = editText.Text.Trim();
+ Regex regtest = new Regex(@"\p{Cs}");
+ Match match = regtest.Match(text);
+ if (match.Success)
{
- if (titleId == StringId.ModifyMemberNickname)
- {
- return;
- }
+ HDLCommon.Current.ShowAlert(Language.StringByID(StringId.CannotEnterSpecialCharacters));
+ return;
+ }
+ if (string.IsNullOrEmpty(text) || list.Contains(text))
+ {
+ //if (titleId == StringId.ModifyMemberNickname)
+ //{
+ // return;
+ //}
string tipMsgString = "";
- if (string.IsNullOrEmpty(editText.Text.Trim()))
+ if (string.IsNullOrEmpty(text))
{
tipMsgString = Language.StringByID(errorId_IsNullOrEmpty);
}
@@ -58,7 +66,7 @@
}
- callBackAction(editText.Text.Trim());
+ callBackAction(text);
dialog.Close();
};
}
@@ -120,10 +128,29 @@
Text = editParater,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- SecureTextEntry = encryption,
+ //SecureTextEntry = encryption,
//TextAlignment = TextAlignment.CenterLeft ,
};
editView.AddChidren(etParater);
+ if(encryption)
+ {
+ etParater.SecureTextEntry = encryption;
+ }
+
+ 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) =>
{
@@ -600,11 +627,12 @@
var btnConfrim = new Button()
{
- Width = Application.GetRealWidth(320),
+ X = Application.GetRealWidth(160),
+ Width = Application.GetRealWidth(160),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Complete,
+ TextID = StringId.Confirm,
};
topView.AddChidren(btnConfrim);
--
Gitblit v1.8.0