Merge branch 'release0123' into wxr0114

wxr

2022-05-26 e34270918f2e831048114ecdfcfec3e3cdbb6fd7

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

@@ -156,9 +156,33 @@
                {
                    unallocatedList.Add(function);
                }

            }
            if (string.IsNullOrEmpty(DB_ResidenceData.Instance.sceneChooseRoomId))
            {
                LoadFunctionListRow(null);
            }
            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 (funtion.roomIds.Contains(selectedRoom.roomId))
                    {
                        listFun.Add(funtion);
                    }
                }
                LoadFunctionListRow(listFun);

            }

            LoadFunctionListRow(null);

            LoadEventList();
        }
@@ -278,6 +302,7 @@
                form.ShowDeviceFunctionView(btnFloor, listAllFun, (selectId, listFun) =>

                {

                    nowSelectId = selectId;

                    DB_ResidenceData.Instance.sceneChooseRoomId = selectId;

                    //重新刷新设备列表

                    this.LoadFunctionListRow(listFun);

                }, nowSelectId);