From e71c57108e6dd407c2c6f0361f68150f2ff9aed5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 13:41:16 +0800
Subject: [PATCH] 版本备份
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index cfab368..ddeb9d9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -284,11 +284,6 @@
btnSceneDelayInfo.Text = scene.GetDelayText();
scene.EditScene();
};
- 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(action,scene.delay);
};
@@ -373,8 +368,10 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
//IsBold = true
};
- bodyView.AddChidren(btnComplete);
-
+ if (scene.can_delete)
+ {
+ bodyView.AddChidren(btnComplete);
+ }
LoadEventList();
var waitPage = new Loading();
@@ -482,7 +479,7 @@
};
row.AddChidren(btnFunctionDelayInfo);
- if (Convert.ToInt32( scenefunction.delay) > 0)
+ if (!string.IsNullOrEmpty(scenefunction.delay) && Convert.ToInt32( scenefunction.delay) > 0)
{
btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
}
--
Gitblit v1.8.0