From 7ee9224f4779efc78bfc8130e518e7d123864d47 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 11:42:38 +0800
Subject: [PATCH] 修复退出登录,挤下线卡死问题

---
 HDL_ON/UI/UI2/2-Classification/RoomPage.cs |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 3c04eec..f19a9d6 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
@@ -88,6 +89,9 @@
                 {
                     continue;
                 }
+#if DEBUG
+                //throw new ArgumentNullException();
+#endif
 
                 functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
 
@@ -127,22 +131,32 @@
                     functionListView.AddChidren(functionDiv);
                 }
             }
-            foreach (var scene in room.GetRoomScenes(false))
+            try
             {
-                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
-                var sceneRow = new FrameLayout()
+                foreach (var scene in room.GetRoomScenes(false))
                 {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(116),
-                    Radius = (uint)Application.GetMinRealAverage(12),
-                    BorderColor = 0x00FFFFFF,
-                    BorderWidth = 1,
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                    Tag = "Scene-" + scene.sid
-                };
-                functionListView.AddChidren(sceneRow);
-                LoadSceneRow(sceneRow, scene);
+                    if (scene == null)
+                    {
+                        continue;
+                    }
+                    functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+                    var sceneRow = new FrameLayout()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Width = Application.GetRealWidth(343),
+                        Height = Application.GetRealHeight(116),
+                        Radius = (uint)Application.GetMinRealAverage(12),
+                        BorderColor = 0x00FFFFFF,
+                        BorderWidth = 1,
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                        Tag = "Scene-" + scene.sid
+                    };
+                    functionListView.AddChidren(sceneRow);
+                    LoadSceneRow(sceneRow, scene);
+                }
+            }catch (Exception ex)
+            {
+                MainPage.Log($"RoomPage LoadPage Error:{ex.Message}");
             }
         }
 

--
Gitblit v1.8.0