From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 422 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
index 9603b0c..c842a69 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Threading;
using HDL_ON.UI.CSS;
using Shared;
@@ -25,7 +26,7 @@
/// <param name="confirmAction">鍥炶皟鍑芥暟</param>
/// <param name="List">琚绱㈠垪琛�</param>
/// <param name="confirmAction">鍥炶皟鍑芥暟</param>
- public void InputBox(int titleId, string tnputEditTxet, int errorId_IsNullOrEmpty, int errorId_PresenceP, List<string> List, Action<string> confirmAction)
+ public void InputBox(int titleId, string tnputEditTxet, int errorId_IsNullOrEmpty, int errorId_PresenceP, List<string> List, Action<string,Dialog> confirmAction, Action action,bool tag=true)
{
Dialog dialog = new Dialog()
{
@@ -52,7 +53,7 @@
X = Application.GetRealWidth(35),
Height = Application.GetRealHeight(22),
Width = Application.GetRealWidth(200),
- TextColor =CSS_Color.textConfirmColor,
+ TextColor = CSS_Color.textConfirmColor,
TextSize = TextSize.text16,
TextAlignment = TextAlignment.Center,
TextID = titleId,
@@ -92,8 +93,8 @@
{
X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/clear.png",
};
editBjView.AddChidren(clearIconBtn);
@@ -116,7 +117,7 @@
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(44),
TextAlignment = TextAlignment.Center,
- TextColor =CSS_Color.textTipColor,
+ TextColor = CSS_Color.textTipColor,
TextSize = TextSize.text16,
TextID = StringId.cancelMusic,
Gravity = Gravity.BottomLeft,
@@ -144,6 +145,8 @@
btnCancel.MouseUpEventHandler += (sender, e) =>
{
dialog.Close();
+ action();
+
};
Button btnTip = new Button
{
@@ -185,8 +188,10 @@
}
- confirmAction(editText.Text.Trim());
- dialog.Close();
+ confirmAction(editText.Text.Trim(),dialog);
+ if (tag) {
+ dialog.Close();
+ }
};
}
@@ -198,7 +203,7 @@
/// <param name="tnputEditTxet">鏄剧ず鏂囨湰</param>
/// <param name="errorId_IsNullOrEmpty">杈撳叆妗嗘湰鏂囦负绌鸿嚜瀹氫箟鎻愮ず閿欒鏂囨湰</param>
/// <param name="confirmAction">鍥炶皟鍑芥暟</param>
- public void InputBox(int titleId, string tnputEditTxet, int errorId_IsNullOrEmpty, Action<string> confirmAction)
+ public void InputBox(int titleId, string tnputEditTxet, int errorId_IsNullOrEmpty, Action<string> confirmAction,Action action)
{
Dialog dialog = new Dialog()
{
@@ -259,19 +264,218 @@
TextAlignment = TextAlignment.CenterLeft,
};
editBjView.AddChidren(editText);
+
Button clearIconBtn = new Button
{
X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/clear.png",
};
editBjView.AddChidren(clearIconBtn);
clearIconBtn.MouseUpEventHandler += (sender, e) =>
{
editText.Text = "";
+ };
+
+ Button btnLine = new Button()
+ {
+ Y = whiteView.Height - Application.GetRealHeight(44 + 1),
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.viewLine,
+ };
+ whiteView.AddChidren(btnLine);
+
+ Button btnCancel = new Button()
+ {
+ Y = btnLine.Bottom,
+ Width = Application.GetRealWidth(135),
+ Height = Application.GetRealHeight(44),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.textTipColor,
+ TextSize = TextSize.text16,
+ TextID = StringId.cancelMusic,
+ Gravity = Gravity.BottomLeft,
+ };
+ whiteView.AddChidren(btnCancel);
+ btnCancel.SetCornerWithSameRadius(Application.GetRealHeight(RradiusFrameLayout), HDLUtils.RectCornerBottomLeft);
+
+ Button btnConfirm = new Button()
+ {
+ X = btnCancel.Right,
+ Y = btnLine.Bottom,
+ Width = Application.GetRealWidth(135),
+ Height = Application.GetRealHeight(44),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.view,
+ IsBold = true,
+ TextSize = TextSize.text16,
+ TextID = StringId.confirmMusic,
+ BackgroundColor = CSS_Color.textConfirmColor,
+ Gravity = Gravity.BottomRight,
+ };
+ whiteView.AddChidren(btnConfirm);
+ btnConfirm.SetCornerWithSameRadius(Application.GetRealHeight(RradiusFrameLayout), HDLUtils.RectCornerBottomRight);
+ dialog.Show();
+ btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.Close();
+ action();
+
+ };
+
+ Button btnTip = new Button
+ {
+ Width = Application.GetRealWidth(0),
+ };
+ whiteView.AddChidren(btnTip);//涓�鐩撮敊璇紝涓�鐩寸寷鐐癸紝涓�鐩村姞鎺т欢
+
+ btnConfirm.MouseUpEventHandler += (sender, e) =>
+ {
+ if (string.IsNullOrEmpty(editText.Text.Trim()))
+ {
+
+ whiteView.Height = Application.GetRealHeight(183);
+ btnLine.Y = whiteView.Height - Application.GetRealHeight(44 + 1);
+ btnCancel.Y = btnLine.Bottom;
+ btnCancel.Gravity = Gravity.BottomLeft;
+ btnConfirm.Y = btnLine.Bottom;
+ btnConfirm.Gravity = Gravity.BottomRight;
+
+ btnTip.X = Application.GetRealWidth(24);
+ btnTip.Y = editBjView.Bottom + Application.GetRealHeight(12);
+ btnTip.Width = Application.GetRealWidth(222);
+ btnTip.Height = Application.GetRealHeight(17);
+ btnTip.Text = Language.StringByID(errorId_IsNullOrEmpty);
+ btnTip.TextColor = CSS_Color.textRedColor;
+ btnTip.TextSize = TextSize.text12;
+ btnTip.TextAlignment = TextAlignment.CenterLeft;
+ return;
+ }
+
+
+ confirmAction(editText.Text.Trim());
+ dialog.Close();
+ };
+
+ }
+
+ /// <summary>
+ /// 杈撳叆妗�
+ /// </summary>
+ /// <param name="titleId">鏍囬鏂囨湰</param>
+ /// <param name="tnputEditTxet">鏄剧ず鏂囨湰</param>
+ /// <param name="confirmAction">鍥炶皟鍑芥暟</param>
+ public void InputBox(int titleId, string tnputEditTxet, Action<string> confirmAction)
+ {
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = CSS_Color.viewTrans60lucence,
+ };
+
+ FrameLayout whiteView = new FrameLayout()
+ {
+ //Gravity = Gravity.Center,
+ X = Application.GetRealWidth(53),
+ Y = Application.GetRealHeight(264),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(172),
+ BackgroundColor = CSS_Color.view,
+ BorderColor = CSS_Color.viewTranslucence,
+ BorderWidth = 0,
+ Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
+ };
+ dialog.AddChidren(whiteView);
+
+ Button btnTitle = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ X = Application.GetRealWidth(35),
+ Height = Application.GetRealHeight(22),
+ Width = Application.GetRealWidth(200),
+ TextColor = CSS_Color.textConfirmColor,
+ TextSize = TextSize.text16,
+ TextAlignment = TextAlignment.Center,
+ TextID = titleId,
+
+ };
+ whiteView.AddChidren(btnTitle);
+
+ FrameLayout editBjView = new FrameLayout()
+ {
+ // Gravity = Gravity.CenterHorizontal,
+ Y = btnTitle.Bottom + Application.GetRealHeight(16),
+ X = Application.GetRealWidth(53),
+ Width = Application.GetRealWidth(157),
+ Height = Application.GetRealHeight(40),
+ BackgroundColor = CSS_Color.viewMiddle,
+ BorderColor = CSS_Color.viewTranslucence,
+ BorderWidth = 0,
+ Radius = (uint)Application.GetRealHeight(radiusEditFrameLayout),
+ };
+ whiteView.AddChidren(editBjView);
+
+ EditText editText = new EditText()
+ {
+ // X = Application.GetRealWidth(12),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(157),
+ Height = Application.GetRealHeight(20),
+ Text = tnputEditTxet,
+ TextColor = CSS_Color.textColor,
+ TextSize = TextSize.text14,
+ TextAlignment = TextAlignment.Center,
+ IsNumberKeyboardType=true,
+ };
+ editBjView.AddChidren(editText);
+
+ Button btn_subtract = new Button
+ {
+ X = Application.GetRealWidth(17),
+ Y = Application.GetRealHeight(66),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
+ UnSelectedImagePath = "LogicIcon/-.png",
+ };
+ whiteView.AddChidren(btn_subtract);
+ Button btn_add = new Button
+ {
+ X = Application.GetRealWidth(222),
+ Y = Application.GetRealHeight(66),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
+ UnSelectedImagePath = "LogicIcon/+.png",
+ };
+ whiteView.AddChidren(btn_add);
+ btn_subtract.MouseUpEventHandler += (sender, e) =>
+ {
+
+ string editTextValue = editText.Text;
+ if (!string.IsNullOrEmpty(editTextValue))
+ {
+ int intValue = int.Parse(editTextValue);
+ if (intValue>1)
+ {
+ editText.Text = (intValue - 1).ToString();
+
+ }
+ }
+
+ };
+ btn_add.MouseUpEventHandler += (sender, e) =>
+ {
+
+ string editTextValue = editText.Text;
+ if (!string.IsNullOrEmpty(editTextValue))
+ {
+ int intValue = int.Parse(editTextValue);
+ if (intValue <100)
+ {
+ editText.Text = (intValue + 1).ToString();
+ }
+ }
};
Button btnLine = new Button()
@@ -326,9 +530,22 @@
btnConfirm.MouseUpEventHandler += (sender, e) =>
{
+ string errorId_IsNullOrEmpty = "";
if (string.IsNullOrEmpty(editText.Text.Trim()))
{
-
+ errorId_IsNullOrEmpty = Language.StringByID(StringId.nullvalue);
+ }
+ else
+ {
+ var editTextValue = editText.Text.Trim();
+ int intValue = int.Parse(editTextValue);
+ if (intValue <= 0 || intValue > 100)
+ {
+ errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue);
+ }
+ }
+ if (errorId_IsNullOrEmpty!="")
+ {
whiteView.Height = Application.GetRealHeight(183);
btnLine.Y = whiteView.Height - Application.GetRealHeight(44 + 1);
btnCancel.Y = btnLine.Bottom;
@@ -336,25 +553,23 @@
btnConfirm.Y = btnLine.Bottom;
btnConfirm.Gravity = Gravity.BottomRight;
- btnTip.X = Application.GetRealWidth(24);
+ btnTip.X = Application.GetRealWidth(53);
btnTip.Y = editBjView.Bottom + Application.GetRealHeight(12);
- btnTip.Width = Application.GetRealWidth(222);
- btnTip.Height = Application.GetRealHeight(17);
- btnTip.Text = Language.StringByID(errorId_IsNullOrEmpty);
+ btnTip.Width = Application.GetRealWidth(157);//200
+ btnTip.Height = Application.GetRealHeight(24);//17
+ btnTip.Text = errorId_IsNullOrEmpty;
btnTip.TextColor = CSS_Color.textRedColor;
btnTip.TextSize = TextSize.text12;
btnTip.TextAlignment = TextAlignment.CenterLeft;
+ btnTip.IsMoreLines = true;
return;
}
-
confirmAction(editText.Text.Trim());
dialog.Close();
};
}
-
-
/// <summary>
/// 纭畾鎻愮ず妗�
/// </summary>
@@ -401,7 +616,7 @@
X = Application.GetRealWidth(20),
Height = Application.GetRealHeight(22),
Width = Application.GetRealWidth(270 - 20 * 2),
- TextColor =CSS_Color.textTipColor,
+ TextColor = CSS_Color.textTipColor,
TextSize = TextSize.text12,
TextAlignment = TextAlignment.Center,
TextID = tipTxet,
@@ -423,7 +638,7 @@
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(44),
TextAlignment = TextAlignment.Center,
- TextColor =CSS_Color.textTipColor,
+ TextColor = CSS_Color.textTipColor,
TextSize = TextSize.text16,
TextID = StringId.cancelMusic,
Gravity = Gravity.BottomLeft,
@@ -456,6 +671,114 @@
{
confirmAction();
dialog.Close();
+ };
+
+ }
+
+ /// <summary>
+ /// 纭畾鎻愮ず妗�
+ /// </summary>
+ /// <param name="titleId">鏍囬鏂囨湰</param>
+ /// <param name="tipTxet">鑷畾涔夋彁绀烘枃鏈�</param>
+ /// <param name="confirmAction">鍥炶皟鍑芥暟</param>
+ public void TipBox(int titleId, string tipTxet, Action<Dialog> confirmAction,Action action,bool tag=true)
+ {
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+
+ FrameLayout whiteView = new FrameLayout()
+ {
+ //Gravity = Gravity.Center,
+ X = Application.GetRealWidth(53),
+ Y = Application.GetRealHeight(264),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(140),
+ BackgroundColor = CSS_Color.view,
+ BorderColor = CSS_Color.viewTranslucence,
+ BorderWidth = 0,
+ Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
+ };
+ dialog.AddChidren(whiteView);
+
+ Button titleBtn = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ X = Application.GetRealWidth(35),
+ Height = Application.GetRealHeight(22),
+ Width = Application.GetRealWidth(270 - 35 * 2),
+ TextColor = CSS_Color.textConfirmColor,
+ TextSize = TextSize.text16,
+ TextAlignment = TextAlignment.Center,
+ TextID = titleId,
+ };
+ whiteView.AddChidren(titleBtn);
+
+ Button tipBtn = new Button()
+ {
+ Y = titleBtn.Bottom + Application.GetRealHeight(8),
+ X = Application.GetRealWidth(20),
+ Height = Application.GetRealHeight(22),
+ Width = Application.GetRealWidth(270 - 20 * 2),
+ TextColor = CSS_Color.textTipColor,
+ TextSize = TextSize.text12,
+ TextAlignment = TextAlignment.Center,
+ Text= tipTxet,
+ };
+ whiteView.AddChidren(tipBtn);
+
+
+ Button btnLine = new Button()
+ {
+ Y = whiteView.Height - Application.GetRealHeight(44 + 1),
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.viewLine,
+ };
+ whiteView.AddChidren(btnLine);
+
+ Button btnCancel = new Button()
+ {
+ Y = btnLine.Bottom,
+ Width = Application.GetRealWidth(135),
+ Height = Application.GetRealHeight(44),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.textTipColor,
+ TextSize = TextSize.text16,
+ TextID = StringId.cancelMusic,
+ Gravity = Gravity.BottomLeft,
+ };
+ whiteView.AddChidren(btnCancel);
+ btnCancel.SetCornerWithSameRadius(Application.GetRealHeight(RradiusFrameLayout), HDLUtils.RectCornerBottomLeft);
+ Button btnConfirm = new Button()
+ {
+ X = btnCancel.Right,
+ Y = btnLine.Bottom,
+ Width = Application.GetRealWidth(135),
+ Height = Application.GetRealHeight(44),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.view,
+ IsBold = true,
+ TextSize = TextSize.text16,
+ TextID = StringId.confirmMusic,
+ BackgroundColor = CSS_Color.textConfirmColor,
+ Gravity = Gravity.BottomRight,
+ };
+ whiteView.AddChidren(btnConfirm);
+ btnConfirm.SetCornerWithSameRadius(Application.GetRealHeight(RradiusFrameLayout), HDLUtils.RectCornerBottomRight);
+ dialog.Show();
+ btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
+ action();
+ dialog.Close();
+ };
+
+ btnConfirm.MouseUpEventHandler += (sender, e) =>
+ {
+ confirmAction(dialog);
+ if (tag) {
+ dialog.Close();
+ }
};
}
@@ -565,5 +888,84 @@
};
}
+
+ /// <summary>
+ /// 淇℃伅鎻愮ず绐楀彛锛岃嚜鍔ㄥ叧闂�
+ /// </summary>
+ /// <param name="msg">鎻愮ず閿欒鏂囨湰</param>
+ public void FlashingBox(string msg,int time=2)
+ {
+ new PublicAssmebly().TipMsgAutoClose(msg, false, time*1000);
+ }
+
+ /// <summary>
+ /// 閿欒淇℃伅鎻愮ず绐楀彛锛屾墜鍔ㄧ‘瀹氬叧闂�
+ /// </summary>
+ /// <param name="titleId">鏍囬鏂囨湰</param>
+ /// <param name="msgId">鎻愮ず閿欒鏂囨湰</param>
+ public void TipBox(int titleId, int msgId)
+ {
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = CSS_Color.viewTrans60lucence,
+ };
+
+ FrameLayout contentView = new FrameLayout()
+ {
+ Gravity = Gravity.Center,
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(140),
+ BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
+ };
+ dialog.AddChidren(contentView);
+
+ Button btnTitle = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(22),
+ TextColor = CSS_Color.MainColor,
+ TextSize = LogicView.TextSize.text16,
+ TextAlignment = TextAlignment.Center,
+ TextID= titleId,
+ };
+ contentView.AddChidren(btnTitle);
+
+ Button btnMsg = new Button()
+ {
+ Height = Application.GetRealHeight(17),
+ Y = Application.GetRealHeight(50),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = LogicView.TextSize.text12,
+ TextID = msgId,
+ };
+ contentView.AddChidren(btnMsg);
+
+ Button btnLine = new Button()
+ {
+ Y = Application.GetRealHeight(96),
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.viewLine,
+ };
+ contentView.AddChidren(btnLine);
+
+ Button btnConfirm = new Button()
+ {
+ Y = btnLine.Bottom,
+ Height = Application.GetRealHeight(43),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.MainColor,
+ TextSize = TextSize.text16,
+ TextID = StringId.Close,
+ };
+ contentView.AddChidren(btnConfirm);
+ dialog.Show();
+ btnConfirm.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.Close();
+ };
+
+ }
}
}
--
Gitblit v1.8.0