From b971c9c46e42f96114b602d8fd9632ac7fad7d47 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 十二月 2021 13:30:22 +0800
Subject: [PATCH] 2021-12-23 1.调试软件上传新房间列表后，保留以前的房间列表。V2.612231
---
Crabtree/SmartHome/HDL/Common/CommonUtlis.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
index 5f543c5..50ab6c6 100644
--- a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
+++ b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
@@ -261,6 +261,12 @@
btnOption.MouseUpEventHandler += (sdf, fds) => {
//淇敼鍚嶇О
var newStr = etZoneName.Text.Trim ();
+ //杈撳叆鍐呭涓嶈兘涓虹┖
+ if (string.IsNullOrEmpty (newStr)) {
+ Utlis.ShowTip (Language.StringByID(SimpleControl.R.MyInternationalizationString.PleaseEnterContent));
+ return;
+ }
+
if (nameStr != newStr) {
saveAction?.Invoke (newStr);
}
@@ -649,6 +655,7 @@
/// <summary>
/// 鏈湴Common鍖归厤浜戠鐨凢unctionList 杩斿洖Function
+ /// 鍖归厤瀛愮綉鍙枫�佽澶囧彿銆佸洖璺彿銆佸ぇ绫诲皬绫�
/// </summary>
/// <param name="common">鏈湴璁惧</param>
/// <returns></returns>
@@ -659,7 +666,8 @@
foreach (var function in FunctionList) {
if (common.SubnetID == function.bus.SubnetID &&
common.DeviceID == function.bus.DeviceID &&
- common.LoopID == function.bus.LoopId
+ common.LoopID == function.bus.LoopId &&
+ common.DeviceTypeString == function.DeviceTypeString
) {
return function;
}
--
Gitblit v1.8.0