From 122dc4312c72b2d2aaa50a2adf84165f5600b99a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 27 一月 2021 17:13:48 +0800
Subject: [PATCH] 2021-1-27-1
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 2116491..9a5237a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -284,7 +284,12 @@
btnSceneDelayInfo.Text = FunctionList.List.GetDelayText(obj);
scene.EditScene();
};
- new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
+ Dictionary<string, string> items = new Dictionary<string, string>();
+ items.Add("30", "30s");
+ items.Add("60", "1min");
+ items.Add("120", "2min");
+ items.Add("300", "5min");
+ new PublicAssmebly().SetSceneDelayDialog(items,action,scene.delay);
};
contentView.AddChidren(new Button()
@@ -394,6 +399,7 @@
{
LoadFunctionRow();
waitPage.Hide();
+ waitPage.RemoveFromParent();
});
}
else
@@ -407,6 +413,7 @@
Application.RunOnMainThread(() =>
{
waitPage.Hide();
+ waitPage.RemoveFromParent();
});
}
}).Start();
--
Gitblit v1.8.0