From e172a0f48fdd01733e04bda2370846b9f36b840f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 14:44:03 +0800
Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段，psk参数取值不能取cname和deviceName
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index aaf11da..7c78d90 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,8 +63,15 @@
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnLocationInfoRight.MouseUpEventHandler = eventHandler;
- btnLocationValues.MouseUpEventHandler = eventHandler;
+ if (btnLocationInfoRight != null)
+ {
+ btnLocationInfoRight.MouseUpEventHandler = eventHandler;
+ }
+ if (btnLocationValues != null)
+ {
+ btnLocationValues.MouseUpEventHandler = eventHandler;
+ }
+
}
}
}
--
Gitblit v1.8.0