From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index d80eb59..471a499 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -362,6 +362,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = isWhite ? CSS_Color.FirstLevelTitleColor : CSS_Color.MainBackgroundColor,
Text = msg,
+ IsMoreLines = true,
};
frame.AddChidren(btnTipMsg);
@@ -541,12 +542,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,
@@ -624,7 +623,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 +643,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 +663,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 +683,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 +703,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 +713,11 @@
btn4.IsSelected = false;
if(btn1.IsSelected)
{
- changeDelay = 30;
+ changeDelay = "30";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn2.MouseUpEventHandler = (sender, e) => {
@@ -729,11 +727,11 @@
btn4.IsSelected = false;
if (btn2.IsSelected)
{
- changeDelay = 60;
+ changeDelay = "60";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn3.MouseUpEventHandler = (sender, e) => {
@@ -743,11 +741,11 @@
btn4.IsSelected = false;
if (btn3.IsSelected)
{
- changeDelay = 120;
+ changeDelay = "120";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn4.MouseUpEventHandler = (sender, e) => {
@@ -757,11 +755,11 @@
btn1.IsSelected = false;
if (btn4.IsSelected)
{
- changeDelay = 300;
+ changeDelay = "300";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
--
Gitblit v1.8.0