From 39b8b0b9bcf5805ada1a44e5dc72f05f9c6e4fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 25 七月 2023 13:12:30 +0800
Subject: [PATCH] 2.0备份
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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..ddba883 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -21,14 +21,14 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView_AddIcon("CombinedDimming",
+ new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_AddIcon("CombinedDimming",
(s,c)=>{
try
{
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();
@@ -229,6 +234,8 @@
{
if (pack.Code == StateCode.SUCCESS)
{
+ var delTemp = FunctionList.List.groupControls.Find((obj) => groupControl.sid == obj.sid);
+ FunctionList.List.groupControls.Remove(delTemp);
list.Remove(groupControl);
LoadGroupControlView(list);
}
--
Gitblit v1.8.0