Merge branch 'release0123' into wxr0114

wxr

2022-06-27 4047f825119fd65a8ed41ade4b2324d8a7f94902

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs

@@ -165,22 +165,28 @@
            else
            {
                var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId);

                var listAllFun = new List<Function>();

                var listFun = new List<Function>();

                listAllFun.AddRange(unallocatedList);

                listAllFun.AddRange(allocatedList);

                btnFloor.Text = selectedRoom.floorRoomName;
                foreach(var funtion in listAllFun)
                if (selectedRoom == null)
                {
                    if (funtion.roomIds.Contains(selectedRoom.roomId))
                    {
                        listFun.Add(funtion);
                    }
                    LoadFunctionListRow(null);
                }
                LoadFunctionListRow(listFun);
                else
                {

                    var listAllFun = new List<Function>();
                    var listFun = new List<Function>();
                    listAllFun.AddRange(unallocatedList);
                    listAllFun.AddRange(allocatedList);

                    btnFloor.Text = selectedRoom.floorRoomName;
                    foreach (var funtion in listAllFun)
                    {
                        if (funtion.roomIds.Contains(selectedRoom.roomId))
                        {
                            listFun.Add(funtion);
                        }
                    }
                    LoadFunctionListRow(listFun);
                }
            }