From e7290281eabcb88d2e430dea9782565474837ce1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 20 十月 2023 14:29:54 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 c842a69..7943ef1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -11,11 +11,11 @@
/// <summary>
/// 澶ф鍦嗚鍊�
/// </summary>
- public int RradiusFrameLayout = 15;
+ private int RradiusFrameLayout = 15;
/// <summary>
/// 灏忔鍦嗚鍊�
/// </summary>
- public int radiusEditFrameLayout = 4;
+ private int radiusEditFrameLayout = 4;
/// <summary>
/// 杈撳叆妗�
/// </summary>
@@ -368,7 +368,9 @@
/// <param name="titleId">鏍囬鏂囨湰</param>
/// <param name="tnputEditTxet">鏄剧ず鏂囨湰</param>
/// <param name="confirmAction">鍥炶皟鍑芥暟</param>
- public void InputBox(int titleId, string tnputEditTxet, Action<string> confirmAction)
+ /// <param name="minValue">鏈�灏忓��</param>
+ /// <param name="maxValue">鏈�澶у��</param>
+ public void InputBox(int titleId, string tnputEditTxet, Action<string> confirmAction,int minValue=1,int maxValue=100)
{
Dialog dialog = new Dialog()
{
@@ -537,11 +539,18 @@
}
else
{
- var editTextValue = editText.Text.Trim();
- int intValue = int.Parse(editTextValue);
- if (intValue <= 0 || intValue > 100)
+ int intValue = -1;
+ try
{
- errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue);
+ intValue = int.Parse(editText.Text.Trim());
+ }
+ catch
+ {
+ intValue = -1;
+ }
+ if (intValue < minValue || intValue > maxValue)
+ {
+ errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue).Replace("1", minValue.ToString()).Replace("100", maxValue.ToString());
}
}
if (errorId_IsNullOrEmpty!="")
@@ -556,7 +565,7 @@
btnTip.X = Application.GetRealWidth(53);
btnTip.Y = editBjView.Bottom + Application.GetRealHeight(12);
btnTip.Width = Application.GetRealWidth(157);//200
- btnTip.Height = Application.GetRealHeight(24);//17
+ btnTip.Height = Application.GetRealHeight(17);//17
btnTip.Text = errorId_IsNullOrEmpty;
btnTip.TextColor = CSS_Color.textRedColor;
btnTip.TextSize = TextSize.text12;
@@ -564,8 +573,8 @@
btnTip.IsMoreLines = true;
return;
}
-
- confirmAction(editText.Text.Trim());
+ string editTextValue= int.Parse(editText.Text.Trim()).ToString();
+ confirmAction(editTextValue);
dialog.Close();
};
@@ -893,9 +902,12 @@
/// 淇℃伅鎻愮ず绐楀彛锛岃嚜鍔ㄥ叧闂�
/// </summary>
/// <param name="msg">鎻愮ず閿欒鏂囨湰</param>
- public void FlashingBox(string msg,int time=2)
+ public void FlashingBox(string msg, int time = 2)
{
- new PublicAssmebly().TipMsgAutoClose(msg, false, time*1000);
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
+ });
}
/// <summary>
--
Gitblit v1.8.0