Merge branch 'Dev-Wxr' into Dev-Branch

wxr

2023-05-09 bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0

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