From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 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..f26af22 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("{0}", minValue.ToString()).Replace("{1}", maxValue.ToString());
                     }
                 }
                 if (errorId_IsNullOrEmpty!="")
@@ -555,8 +564,8 @@
 
                     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.Width = Application.GetRealWidth(180);//200
+                    btnTip.Height = Application.GetRealHeight(20);//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