From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 6d960f5..c4b2d1b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -28,7 +28,7 @@
var page = new AddGroupControlPage(null,
(newGC)=> {
ReadGroupControlList();
- });
+ },()=> { });
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -98,7 +98,7 @@
list.Add(new GroupControl()
{
name = "缁勫悎璋冨厜1",
- roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
+ roomIds = new List<string> {},
sid = "00000000000000001",
type = "light",
});
@@ -106,7 +106,7 @@
list.Add(new GroupControl()
{
name = "缁勫悎璋冨厜2",
- roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
+ roomIds = new List<string> { },//Room.CurrentSpatial.RoomList[0].roomId
sid = "00000000000000002",
type = "light",
});
@@ -185,15 +185,20 @@
(newGC) => {
try
{
- Application.RunOnMainThread(() =>
+ if (newGC != null)
{
- groupControl.roomIds = newGC.uids;
- btnFunctionLocationInfo.Text = newGC.GetUidListName();
- });
+ Application.RunOnMainThread(() =>
+ {
+ groupControl.roomIds = newGC.uids;
+ btnFunctionLocationInfo.Text = newGC.GetUidListName();
+ });
+ }
}catch(Exception ex)
{
MainPage.Log($"鍒锋柊缇ゆ帶鎴块棿淇℃伅寮傚父:{ex.Message}");
}
+ },()=> {
+ LoadGroupControlView(FunctionList.List.groupControls);
});
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
--
Gitblit v1.8.0