From e5248512859d7c85e603d898319469e47cda7071 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 20:45:12 +0800
Subject: [PATCH] 2020-12-17 1.修复自动化隐藏后还能滑动问题。

---
 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index 162a658..18fa6ea 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -26,16 +26,23 @@
                     {
                         new Tip()
                         {
-                            CloseTime = 3,
+                            CloseTime = 1,
                             Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
                             Direction = AMPopTipDirection.None,
                         }.Show(bodyView);
                         return;
                     }
-
-                    function.name = name;
-                    btnFunctionName.Text = name;
-                    DB_ResidenceData.residenceData.SaveResidenceData();
+                    if (function.name != name)
+                    {
+                        if(name.Contains("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]"))
+                        {
+                            HDLCommon.Current.ShowAlert(Language.StringByID(StringId.CannotEnterSpecialCharacters));
+                            return;
+                        }
+                        function.name = name;
+                        btnFunctionName.Text = name;
+                        function.SaveFunctionData(true);
+                    }
                 };
                 new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());
             };

--
Gitblit v1.8.0