From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 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..f39f42f 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,10 @@
                 }
                 else
                 {
-                    var editTextValue = editText.Text.Trim();
-                    int intValue = int.Parse(editTextValue);
-                    if (intValue <= 0 || intValue > 100)
+                    int intValue = int.Parse(editText.Text.Trim());
+                    if (intValue <minValue || intValue > maxValue)
                     {
-                        errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue);
+                        errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue).Replace("1",minValue.ToString()).Replace("000",maxValue.ToString());
                     }
                 }
                 if (errorId_IsNullOrEmpty!="")
@@ -564,8 +565,8 @@
                     btnTip.IsMoreLines = true;
                     return;
                 }
-
-                confirmAction(editText.Text.Trim());
+                string editTextValue= int.Parse(editText.Text.Trim()).ToString();
+                confirmAction(editTextValue);
                 dialog.Close();
             };
 
@@ -893,9 +894,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