From 098ca04f324624d97399c7c1040c46d2a96ebfaa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 23 四月 2023 09:21:54 +0800
Subject: [PATCH] V1.7.1发布版本
---
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 c009c40..6d960f5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -26,7 +26,7 @@
try
{
var page = new AddGroupControlPage(null,
- ()=> {
+ (newGC)=> {
ReadGroupControlList();
});
MainPage.BasePageView.AddChidren(page);
@@ -101,7 +101,6 @@
roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
sid = "00000000000000001",
type = "light",
- uids = new List<string>() { Room.CurrentSpatial.RoomList[0].uid },
});
list.Add(new GroupControl()
@@ -110,7 +109,6 @@
roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
sid = "00000000000000002",
type = "light",
- uids = new List<string>() { Room.CurrentSpatial.RoomList[0].uid },
});
}
@@ -184,12 +182,13 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new AddGroupControlPage(groupControl,
- () => {
+ (newGC) => {
try
{
Application.RunOnMainThread(() =>
{
- btnFunctionLocationInfo.Text = groupControl.GetRoomListName();
+ groupControl.roomIds = newGC.uids;
+ btnFunctionLocationInfo.Text = newGC.GetUidListName();
});
}catch(Exception ex)
{
--
Gitblit v1.8.0