Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-06-30 0b5b6ec781a8cb3400ad34693792bad07e97a00c

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

@@ -156,9 +156,39 @@
                {
                    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);
                if (selectedRoom == null)
                {
                    LoadFunctionListRow(null);
                }
                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);
                }
            }

            LoadFunctionListRow(null);

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

                {

                    nowSelectId = selectId;

                    DB_ResidenceData.Instance.sceneChooseRoomId = selectId;

                    //重新刷新设备列表

                    this.LoadFunctionListRow(listFun);

                }, nowSelectId);