Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs

@@ -145,7 +145,7 @@
                {
                    continue;
                }
                if (!string.IsNullOrEmpty(roomId) && roomId != "ALLSELECT")
                if (!string.IsNullOrEmpty(roomId) && roomId == "ALLSELECT")
                {
                    if (!function.roomIds.Contains(roomId))
                    {
@@ -172,7 +172,7 @@
                {
                    continue;
                }
                if (!string.IsNullOrEmpty(roomId) && roomId != "ALLSELECT")
                if (!string.IsNullOrEmpty(roomId))
                {
                    if (!scene.roomIds.Contains(roomId))
                    {
@@ -202,12 +202,6 @@
        void LoadFunctionListRow()
        {
            functionListView.RemoveAll();
            new System.Threading.Thread(() =>
            {
                System.Threading.Thread.Sleep(50);
                Application.RunOnMainThread(() =>
                {

                    foreach (var function in allocatedList)
                    {
                        //var output = alarm.output.Find((obj) => obj.sid == function.sid);
@@ -270,8 +264,7 @@
                        };
                        functionRow.AddChidren(btnChooseIcon);

                        btnChooseIcon.MouseUpEventHandler = (sender, e) =>
                        {
                btnChooseIcon.MouseUpEventHandler = (sender, e) => {
                            btnChooseIcon.IsSelected = !btnChooseIcon.IsSelected;
                            var tempLocal = alarm.output.Find((obj) =>
                                obj.sid == function.sid
@@ -324,9 +317,6 @@


                    }

                });
            }).Start();
        }


@@ -481,8 +471,7 @@
                var form = new FloorRoomSelectPopupView();
                form.ShowDeviceFunctionView(btnFloor, listAllFun, (selectId, listFun) =>
                {
                    var selecteRoom = SpatialInfo.CurrentSpatial.RoomList.Find((obj) => obj.uid == selectId);
                    SetData(selecteRoom.roomId);
                    SetData(selectId);
                    //重新刷新设备列表
                    this.LoadFunctionListRow();
                }, nowSelectId);