Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-06-07 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0

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

@@ -657,7 +657,7 @@
                                securityAlarm.output.Remove(delTemp);
                            }
                            outputRow.RemoveFromParent();
                            outputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.output.Count);
                            outputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.output.Count + 50 );
                        };
                        outputRow.SetDelClickeEvent(eventHandler);
                    }