Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

 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();