From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 9f45882..23fc8b2 100644
--- 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()))
{
@@ -125,6 +125,21 @@
};
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) =>
{
if (etParater.Text.Length > 20)
@@ -188,17 +203,10 @@
dialog.Show();
- //btnCancel.MouseDownEventHandler += (sender, e) => {
- // btnCancel.IsSelected = true;
- //};
btnCancel.MouseUpEventHandler += (sender, e) =>
{
- //btnCancel.IsSelected = false;
dialog.Close();
};
- //btnConfirm.MouseDownEventHandler += (sender, e) => {
- // btnConfirm.IsSelected = true;
- //};
EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction,
contentView, btnLine, btnCancel, editView, dialog, titleId);
}
@@ -209,7 +217,7 @@
/// <param name="titleId"></param>
/// <param name="msgId"></param>
/// <param name="callBackAction"></param>
- public void TipMsg(int titleId, int msgId, Action callBackAction)
+ public void TipOptionMsg(int titleId, int msgId, Action callBackAction)
{
Dialog dialog = new Dialog()
{
@@ -250,6 +258,7 @@
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = msgId,
+ IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -368,6 +377,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = isWhite ? CSS_Color.FirstLevelTitleColor : CSS_Color.MainBackgroundColor,
Text = msg,
+ IsMoreLines = true,
};
frame.AddChidren(btnTipMsg);
@@ -392,7 +402,7 @@
/// </summary>
/// <param name="titleId"></param>
/// <param name="msgId"></param>
- public void TipMsg(int titleId, int msgId)
+ public void TipMsg(int titleId, int msgId,Action action = null)
{
Dialog dialog = new Dialog()
{
@@ -433,6 +443,7 @@
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = msgId,
+ IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -466,6 +477,7 @@
btnConfirm.MouseUpEventHandler += (sender, e) =>
{
btnConfirm.IsSelected = false;
+ action?.Invoke();
dialog.Close();
};
@@ -545,12 +557,10 @@
/// 鍦烘櫙寤舵椂璁剧疆寮圭獥
/// </summary>
/// <param name="function"></param>
- public void SetSceneDelayDialog(Function function,Button btn)
+ public void SetSceneDelayDialog(Action<string> action,string changeDelay)
{
Button lastButton = new Button();
- int changeDelay = 0;
Dialog dialog = new Dialog();
-
var pView = new FrameLayout()
{
BackgroundColor = CSS_Color.DialogTransparentColor1,
@@ -609,7 +619,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Complete,
+ TextID = StringId.Confirm,
};
topView.AddChidren(btnConfrim);
@@ -628,7 +638,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(80),
- IsSelected = function.delayText == "30s"
+ IsSelected = changeDelay == "30"
};
optionBaseView.AddChidren(btn1);
@@ -648,7 +658,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(195),
Y = Application.GetRealHeight(80),
- IsSelected = function.delayText == "1min"
+ IsSelected = changeDelay == "60"
};
optionBaseView.AddChidren(btn2);
@@ -668,7 +678,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(140),
- IsSelected = function.delayText == "2min"
+ IsSelected = changeDelay == "120"
};
optionBaseView.AddChidren(btn3);
@@ -688,7 +698,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(195),
Y = Application.GetRealHeight(140),
- IsSelected = function.delayText == "5min"
+ IsSelected = changeDelay == "300"
};
optionBaseView.AddChidren(btn4);
@@ -708,9 +718,8 @@
};
btnConfrim.MouseUpEventHandler = (sender, e) =>
{
+ action(changeDelay);
dialog.Close();
- function.delay = changeDelay;
- btn.Text = function.delayText;
};
btn1.MouseUpEventHandler = (sender, e) => {
btn1.IsSelected = !btn1.IsSelected;
@@ -719,11 +728,11 @@
btn4.IsSelected = false;
if(btn1.IsSelected)
{
- changeDelay = 30;
+ changeDelay = "30";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn2.MouseUpEventHandler = (sender, e) => {
@@ -733,11 +742,11 @@
btn4.IsSelected = false;
if (btn2.IsSelected)
{
- changeDelay = 60;
+ changeDelay = "60";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn3.MouseUpEventHandler = (sender, e) => {
@@ -747,11 +756,11 @@
btn4.IsSelected = false;
if (btn3.IsSelected)
{
- changeDelay = 120;
+ changeDelay = "120";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn4.MouseUpEventHandler = (sender, e) => {
@@ -761,11 +770,11 @@
btn1.IsSelected = false;
if (btn4.IsSelected)
{
- changeDelay = 300;
+ changeDelay = "300";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
--
Gitblit v1.8.0