Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 a19e58425e44c8a83c3d1b23de292659c38a6b1e

 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);
                    }