From 57c036644fae5019385829edbd72be9a7e00fa7d Mon Sep 17 00:00:00 2001 From: Tong <1025782220@qq.com> Date: 星期二, 31 八月 2021 10:18:03 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into jpush_tst --- HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs index 5de018c..df3ec88 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs +++ b/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(); @@ -235,7 +235,11 @@ finally { Application.RunOnMainThread(() => { - waitPage.Hide(); + if (waitPage != null) + { + waitPage.RemoveFromParent(); + waitPage = null; + } }); } }) -- Gitblit v1.8.0