From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
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