From c06d8a0b3e3010a06e784ff2d078d4ef59a9ac66 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 18 十二月 2020 17:47:36 +0800
Subject: [PATCH] 2020-12-18 1.房间楼层控件封装FloorSelectPopupDialog、DiySelectPopupDialog
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index 6225cc6..18fa6ea 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -26,18 +26,25 @@
{
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);
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());
};
btnEditName.MouseUpEventHandler = eventHandler;
btnFunctionName.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0