From 2ad1a02662449a261180d31f8b3d0f0cf34b1213 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 四月 2024 10:04:19 +0800
Subject: [PATCH] 组控无法保存修改名称问题修复
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 2 +-
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index 5fef359..3ae8804 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -422,6 +422,7 @@
new PublicAssmebly().TipMsg(StringId.Tip, StringId.PlsEntryGroupName);
return;
}
+ groupControl.name = name;
if (groupControlLightList.Count < 2)
{
new PublicAssmebly().TipMsg(StringId.Tip, StringId.PlsSelectMoreData);
@@ -429,7 +430,6 @@
}
if (isAdd)
{
- groupControl.name = name;
groupControl.sids.Clear();
foreach (var light in groupControlLightList)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 1c9c47a..b630a7e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -223,14 +223,13 @@
{
Application.RunOnMainThread(() =>
{
- //groupControl.roomIds = newGC.roomIds;
- //groupControl.uids = newGC.uids;
- var localTemp = FunctionList.List.groupControls.Find((obj) => obj.deviceId == newGC.deviceId);
+ var localTemp = FunctionList.List.groupControls.Find((obj) => obj.deviceId == newGC.deviceId);
localTemp.roomIds = newGC.roomIds;
localTemp.uids = newGC.uids;
localTemp.sids = newGC.sids;
-
- btnFunctionLocationInfo.Text = newGC.GetUidListName();
+ localTemp.name = newGC.name;
+ btnFunctionLocationInfo.Text = newGC.GetUidListName();
+ btnFunctionName.Text = newGC.name;
});
}
}
--
Gitblit v1.8.0