From c5a873df96e4a797426e4dd5eafe5b43f7aea564 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 15:41:53 +0800
Subject: [PATCH] 20201218-2
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index d80eb59..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()))
{
@@ -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) =>
{
@@ -362,6 +377,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = isWhite ? CSS_Color.FirstLevelTitleColor : CSS_Color.MainBackgroundColor,
Text = msg,
+ IsMoreLines = true,
};
frame.AddChidren(btnTipMsg);
@@ -541,12 +557,10 @@
/// 鍦烘櫙寤舵椂璁剧疆寮圭獥
/// </summary>
/// <param name="function"></param>
- public void SetSceneDelayDialog(Scene scene,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,
@@ -605,7 +619,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Complete,
+ TextID = StringId.Confirm,
};
topView.AddChidren(btnConfrim);
@@ -624,7 +638,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(80),
- IsSelected = scene.delayText == "30s"
+ IsSelected = changeDelay == "30"
};
optionBaseView.AddChidren(btn1);
@@ -644,7 +658,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(195),
Y = Application.GetRealHeight(80),
- IsSelected = scene.delayText == "1min"
+ IsSelected = changeDelay == "60"
};
optionBaseView.AddChidren(btn2);
@@ -664,7 +678,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(140),
- IsSelected = scene.delayText == "2min"
+ IsSelected = changeDelay == "120"
};
optionBaseView.AddChidren(btn3);
@@ -684,7 +698,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(195),
Y = Application.GetRealHeight(140),
- IsSelected = scene.delayText == "5min"
+ IsSelected = changeDelay == "300"
};
optionBaseView.AddChidren(btn4);
@@ -704,9 +718,8 @@
};
btnConfrim.MouseUpEventHandler = (sender, e) =>
{
+ action(changeDelay);
dialog.Close();
- scene.delay = changeDelay;
- btn.Text = scene.delayText;
};
btn1.MouseUpEventHandler = (sender, e) => {
btn1.IsSelected = !btn1.IsSelected;
@@ -715,11 +728,11 @@
btn4.IsSelected = false;
if(btn1.IsSelected)
{
- changeDelay = 30;
+ changeDelay = "30";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn2.MouseUpEventHandler = (sender, e) => {
@@ -729,11 +742,11 @@
btn4.IsSelected = false;
if (btn2.IsSelected)
{
- changeDelay = 60;
+ changeDelay = "60";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn3.MouseUpEventHandler = (sender, e) => {
@@ -743,11 +756,11 @@
btn4.IsSelected = false;
if (btn3.IsSelected)
{
- changeDelay = 120;
+ changeDelay = "120";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn4.MouseUpEventHandler = (sender, e) => {
@@ -757,11 +770,11 @@
btn1.IsSelected = false;
if (btn4.IsSelected)
{
- changeDelay = 300;
+ changeDelay = "300";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
--
Gitblit v1.8.0