From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 886a2f0..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);
@@ -39,7 +39,7 @@
contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(550),
+ Height = Application.GetRealHeight(667 - 64),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(contentView);
@@ -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,8 +182,18 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new AddGroupControlPage(groupControl,
- () => {
-
+ (newGC) => {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ groupControl.roomIds = newGC.uids;
+ btnFunctionLocationInfo.Text = newGC.GetUidListName();
+ });
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鍒锋柊缇ゆ帶鎴块棿淇℃伅寮傚父:{ex.Message}");
+ }
});
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
--
Gitblit v1.8.0