Merge branch 'Dev-Branch' into Dev-Wxr

wxr

2023-04-11 93a578f5182792b4dd981e874e2746e8b3e34e2e

 HDL_ON/UI/UI2/2-Classification/RoomPage.cs

@@ -1,4 +1,5 @@
using 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}");
            }
        }