From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 85 ++++++++++++++++++++----------------------
1 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 00f7b44..25523fb 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -173,7 +173,7 @@
{
X = btnCancel.Right,
Y = btnLine.Y,
- Width = Application.GetRealWidth(135),
+ Width = Application.GetRealWidth(137),
Height = Application.GetRealHeight(43 + 1),
TextAlignment = TextAlignment.Center,
//TextColor = CSS_Color.TextualColor,
@@ -188,17 +188,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 +202,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 +243,7 @@
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = msgId,
+ IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -276,22 +270,12 @@
};
contentView.AddChidren(btnCancel);
- //Button btnBottomLine = new Button()
- //{
- // X = btnCancel.Right,
- // Y = btnLine.Bottom,
- // Height = Application.GetRealHeight(43),
- // Width = Application.GetRealWidth(1),
- // BackgroundColor = CSS_Color.DividingLineColor,
- //};
- //contentView.AddChidren(btnBottomLine);
-
Button btnConfirm = new Button()
{
X = btnCancel.Right,
Y = btnLine.Y,
Width = Application.GetRealWidth(135),
- Height = Application.GetRealHeight(43 + 1),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
//TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -334,20 +318,31 @@
/// <param name="isWhite"></param>
public void TipMsgAutoClose(string msg, bool isWhite, int closeTime = 1500)
{
- Dialog dialog = new Dialog()
+ Dialog dialog = new Dialog();
+
+ FrameLayout dialogBody = new FrameLayout();
+ dialog.AddChidren(dialogBody);
+ dialogBody.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ dialog = null;
+ };
+
+ FrameLayout frame = new FrameLayout()
{
X = Application.GetRealWidth(89),
Y = Application.GetRealHeight(285),
Width = Application.GetRealWidth(198),
Height = Application.GetRealHeight(98),
- };
-
- FrameLayout frame = new FrameLayout()
- {
BackgroundColor = isWhite ? 0xE6FFFFFF : CSS_Color.DialogTransparentColor1,
Radius = (uint)Application.GetRealWidth(12),
};
dialog.AddChidren(frame);
+ frame.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ dialog = null;
+ };
Button btnTipIcon = new Button()
{
@@ -377,7 +372,10 @@
Thread.Sleep(closeTime);
Application.RunOnMainThread(() =>
{
- dialog.Close();
+ if(dialog!=null)
+ {
+ dialog.Close();
+ }
});
})
{ IsBackground = true }.Start();
@@ -388,7 +386,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()
{
@@ -429,6 +427,7 @@
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = msgId,
+ IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -462,6 +461,7 @@
btnConfirm.MouseUpEventHandler += (sender, e) =>
{
btnConfirm.IsSelected = false;
+ action?.Invoke();
dialog.Close();
};
@@ -541,12 +541,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,
@@ -624,7 +622,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(80),
- IsSelected = function.delayText == "30s"
+ IsSelected = changeDelay == "30"
};
optionBaseView.AddChidren(btn1);
@@ -644,7 +642,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(195),
Y = Application.GetRealHeight(80),
- IsSelected = function.delayText == "1min"
+ IsSelected = changeDelay == "60"
};
optionBaseView.AddChidren(btn2);
@@ -664,7 +662,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(140),
- IsSelected = function.delayText == "2min"
+ IsSelected = changeDelay == "120"
};
optionBaseView.AddChidren(btn3);
@@ -684,7 +682,7 @@
SelectedBackgroundColor = CSS_Color.MainColor,
X = Application.GetRealWidth(195),
Y = Application.GetRealHeight(140),
- IsSelected = function.delayText == "5min"
+ IsSelected = changeDelay == "300"
};
optionBaseView.AddChidren(btn4);
@@ -704,9 +702,8 @@
};
btnConfrim.MouseUpEventHandler = (sender, e) =>
{
+ action(changeDelay);
dialog.Close();
- function.delay = changeDelay;
- btn.Text = function.delayText;
};
btn1.MouseUpEventHandler = (sender, e) => {
btn1.IsSelected = !btn1.IsSelected;
@@ -715,11 +712,11 @@
btn4.IsSelected = false;
if(btn1.IsSelected)
{
- changeDelay = 30;
+ changeDelay = "30";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn2.MouseUpEventHandler = (sender, e) => {
@@ -729,11 +726,11 @@
btn4.IsSelected = false;
if (btn2.IsSelected)
{
- changeDelay = 60;
+ changeDelay = "60";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn3.MouseUpEventHandler = (sender, e) => {
@@ -743,11 +740,11 @@
btn4.IsSelected = false;
if (btn3.IsSelected)
{
- changeDelay = 120;
+ changeDelay = "120";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
btn4.MouseUpEventHandler = (sender, e) => {
@@ -757,11 +754,11 @@
btn1.IsSelected = false;
if (btn4.IsSelected)
{
- changeDelay = 300;
+ changeDelay = "300";
}
else
{
- changeDelay = 0;
+ changeDelay = "0";
}
};
--
Gitblit v1.8.0