From 6d458e4338993e578ce81c6b3c4738e85b68b4df Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 02 九月 2021 10:41:49 +0800
Subject: [PATCH] 1.窗帘控制界面去掉按钮状态。 2.RGB灯光渐变时间标题异常显示问题修复。
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index aaf11da..b5d660b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -2,6 +2,7 @@
using System;
using Shared;
using HDL_ON.Entity;
+using System.Text.RegularExpressions;
namespace HDL_ON.UI
{
@@ -22,11 +23,25 @@
//鍒涘缓鍥炶皟浜嬩欢
Action<string> callBackAction = (name) =>
{
- function.name = name;
- btnFunctionName.Text = name;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ if (string.IsNullOrEmpty(name))
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ if (function.name != name)
+ {
+ function.name = name;
+ btnFunctionName.Text = name;
+ function.UpdataFuncitonInfo();
+ actionRefresh?.Invoke();
+ }
};
- 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;
@@ -48,7 +63,10 @@
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnLocationInfoRight.MouseUpEventHandler = eventHandler;
+ if (btnLocationInfoRight != null)
+ {
+ btnLocationInfoRight.MouseUpEventHandler = eventHandler;
+ }
btnLocationValues.MouseUpEventHandler = eventHandler;
}
}
--
Gitblit v1.8.0