From 62d6c4bf6c30da21ccd8245199234c5004117d56 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:32:15 +0800
Subject: [PATCH] V1.7.1发布版本

---
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
index e62de92..c4ed617 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
@@ -62,9 +62,7 @@
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
             new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
 
-        
-
-            var contentView = new VerticalScrolViewLayout()
+            contentView = new VerticalScrolViewLayout()
             {
                 Y = Application.GetRealHeight(64),
                 Height = Application.GetRealHeight(667 - 64),
@@ -176,41 +174,50 @@
         /// </summary>
         void LoadMethod_AllElection()
         {
-            btnAllRoomText.MouseUpEventHandler += (sender, e) =>
+            btnAllRoomText.MouseUpEventHandler = (sender, e) =>
             {
-                btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
-
-                for (int i = 0; i < contentView.ChildrenCount; i++)
+                try
                 {
-                    var view = contentView.GetChildren(i);
-                    if (view.GetType() == typeof(FrameLayout))
+                    btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
+
+                    for (int i = 0; i < contentView.ChildrenCount; i++)
                     {
-                        if (view.Tag != null && view.Tag.ToString() == "row")
+                        var view = contentView.GetChildren(i);
+                        if (view.GetType() == typeof(FrameLayout))
                         {
-                            for (int j = 0; j < (view as FrameLayout).ChildrenCount; j++)
+                            if (view.Tag != null && view.Tag.ToString() == "row")
                             {
-                                var btn = (view as FrameLayout).GetChildren(j);
-                                if (btn.GetType() == typeof(Button))
+                                for (int j = 0; j < (view as FrameLayout).ChildrenCount; j++)
                                 {
-                                    if (btn.Tag != null && btn.Tag.ToString() == "ChooseIcon")
+                                    var btn = (view as FrameLayout).GetChildren(j);
+                                    if (btn.GetType() == typeof(Button))
                                     {
-                                        (btn as Button).IsSelected = btnChooseAll.IsSelected;
+                                        if (btn.Tag != null && btn.Tag.ToString() == "ChooseIcon")
+                                        {
+                                            (btn as Button).IsSelected = btnChooseAll.IsSelected;
+                                        }
                                     }
                                 }
                             }
                         }
                     }
-                }
-                function.roomIds.Clear();
-                if (btnChooseAll.IsSelected)
-                {
-                    foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList)
+                    function.roomIds.Clear();
+                    if (btnChooseAll.IsSelected)
                     {
-                        if (btnChooseAll.IsSelected)
+                        foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList)
                         {
-                            function.roomIds.Add(room.roomId);
+                            if (btnChooseAll.IsSelected)
+                            {
+                                function.roomIds.Add(room.roomId);
+                            }
                         }
                     }
+                }catch(Exception ex)
+                {
+                    MainPage.Log($"GroupChooseRoom 鍏ㄩ�夋寜閽簨浠� error : {ex.Message}");
+                    Application.RunOnMainThread(() => {
+                        this.RemoveFromParent();
+                    });
                 }
             };
         }

--
Gitblit v1.8.0