Merge branch 'WJC' into wxr7

wxr

2021-08-21 264f86c363a6a019fac8eb138877fee9e4734e2d

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

@@ -216,7 +216,7 @@
                        var code = securityAlarm.SaveInfo();
                        if (code == StateCode.SUCCESS)
                        {
                            SecurityCenter.Security.GetSecurityAlarmList();
                            Common.ApiUtlis.Ins.GetSecurityList();
                            Application.RunOnMainThread(() =>
                            {
                                this.RemoveFromParent();