From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:30 +0800
Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
index 8d15c4e..91f18dc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
@@ -190,7 +190,7 @@
{
var tip = new Tip()
{
- Text = "璇疯緭鍏ュ畨闃插悕绉�",
+ Text = Language.StringByID(StringId.PleaseEnterSecurityName),// = "璇疯緭鍏ュ畨闃插悕绉�",
CloseTime = 3,
Direction = AMPopTipDirection.None
};
@@ -202,7 +202,7 @@
{
var tip = new Tip()
{
- Text = "璇烽�夋嫨甯冮槻鐩爣",
+ Text = Language.StringByID(StringId.PleaseSelectTheDeploymentTarget),// "璇烽�夋嫨甯冮槻鐩爣",
CloseTime = 3,
Direction = AMPopTipDirection.None
};
@@ -249,7 +249,11 @@
finally
{
Application.RunOnMainThread(() => {
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
--
Gitblit v1.8.0